diff --git a/.gitmodules b/.gitmodules index eebeeb7859..b1c953dd35 100644 --- a/.gitmodules +++ b/.gitmodules @@ -5,9 +5,6 @@ [submodule "external/oasis-sdk"] path = external/oasis-sdk url = https://github.com/oasisprotocol/oasis-sdk -[submodule "external/oasis-core-ledger"] - path = external/oasis-core-ledger - url = https://github.com/oasisprotocol/oasis-core-ledger [submodule "external/adrs"] path = external/adrs url = https://github.com/oasisprotocol/adrs diff --git a/docs/general/manage-tokens/faq.md b/docs/general/manage-tokens/faq.md index 932aa92405..709734b750 100644 --- a/docs/general/manage-tokens/faq.md +++ b/docs/general/manage-tokens/faq.md @@ -110,15 +110,26 @@ and [import it to the Oasis wallet][oasis-wallet-import-private-key]. ### Chromium under Ubuntu does not recognize my Ledger device. What is the problem? -First check that you added the Ledger udev device descriptors as mentioned in the [Linux installation guide](https://support.ledger.com/hc/en-us/articles/4404389606417-Download-and-install-Ledger-Live). Next, check that your Ledger wallet is recognized by the [Oasis Core Ledger tool](../../oasis-core-ledger/usage/address.md). You should see something like this: - -```bash -$ oasis-core-ledger show_address -oasis1qp8d9kuduq0zutuatjsgltpugxvl38cuaq3gzkmn -Ensure account address shown on device's screen matches the outputted address. -``` - -If all of the above works, then the issue is most likely that Chromium does not have the permission to access your Ledger device. Starting with Ubuntu 20.04 the Chromium browser is installed via snap package by default. Snap is more convenient for upstream developers to deploy their software and it also adds additional layer of security by using apparmor. In our case however, it prevents Chromium to access arbitrary USB devices with WebUSB API including your Ledger device. A workaround for this issue is to install Chromium natively using the official [Chormium beta PPA](https://launchpad.net/\~saiarcot895/+archive/ubuntu/chromium-beta) or the official [Google Chrome .deb package](https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb). +First check that you added the Ledger udev device descriptors as mentioned in +the [Linux installation guide]. Next, check that your Ledger wallet is +recognized by the [Oasis CLI]. You should be able to add your Ledger account to +the Oasis CLI wallet by running: + +![code shell](../../../external/cli/examples/wallet/create.in.static) + +If all of the above works, then the issue is most likely that Chromium does not +have the permission to access your Ledger device. Starting with Ubuntu 20.04 the +Chromium browser is installed via snap package by default. Snap is more +convenient for upstream developers to deploy their software and it also adds +additional layer of security by using apparmor. In our case however, it prevents +Chromium to access arbitrary USB devices with WebUSB API including your Ledger +device. A workaround for this issue is to install Chromium natively using the +official [Chormium beta PPA] or the official [Google Chrome .deb package]. + +[Linux installation guide]: https://support.ledger.com/hc/en-us/articles/4404389606417-Download-and-install-Ledger-Live +[Oasis CLI]: cli/README.md +[Chormium beta PPA]: https://launchpad.net/\~saiarcot895/+archive/ubuntu/chromium-beta +[Google Chrome .deb package]: https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb ### Are Ethereum and Oasis wallets that different? I can use the same mnemonics with both, right? diff --git a/docs/general/manage-tokens/holding-rose-tokens/ledger-wallet.md b/docs/general/manage-tokens/holding-rose-tokens/ledger-wallet.md index 8c9895fe8f..313c49c339 100644 --- a/docs/general/manage-tokens/holding-rose-tokens/ledger-wallet.md +++ b/docs/general/manage-tokens/holding-rose-tokens/ledger-wallet.md @@ -142,8 +142,10 @@ tasks (sending, staking, ParaTime deposits and withdrawals), but also generating and/or signing raw transactions, multi-signatures, network governance operations etc. -Ledger is supported by the Oasis CLI. Follow the instructions in the -[Oasis CLI Tools] page to learn more. +Ledger is supported by the [Oasis CLI]. You can add a new Ledger account to the +Oasis CLI by invoking the [`oasis wallet create`] command. For example: + +![code shell](../../../../external/cli/examples/wallet/create-ledger.in.static) [Ledger]: https://www.ledger.com [Oasis app]: https://github.com/Zondax/ledger-oasis @@ -157,4 +159,5 @@ Ledger is supported by the Oasis CLI. Follow the instructions in the [Nano S Plus]: https://support.ledger.com/hc/en-us/articles/4445777839901-Update-Ledger-Nano-S-Plus-firmware [BIP 39]: https://github.com/bitcoin/bips/blob/master/bip-0039.mediawiki [Oasis Wallets]: ../oasis-wallets/README.mdx -[Oasis CLI Tools]: ../cli/README.md +[Oasis CLI]: ../cli/README.md +[`oasis wallet create`]: ../cli/wallet.md#create diff --git a/docs/node/mainnet/upgrade-log.md b/docs/node/mainnet/upgrade-log.md index 449a255255..da93a4d640 100644 --- a/docs/node/mainnet/upgrade-log.md +++ b/docs/node/mainnet/upgrade-log.md @@ -160,8 +160,7 @@ oasis-node consensus submit_tx \ [upgrade governance proposal]: ../../core/consensus/services/governance.md#submit-proposal [your entity's nonce]: ../../general/manage-tokens/cli/account.md#show [Oasis CLI Tools Setup]: ../../core/oasis-node/cli.md#storing-base-and-signer-flags-in-an-environment-variable -[Installing Oasis App on Your Ledger Wallet]: - ../../oasis-core-ledger/usage/setup#installing-oasis-app-on-your-ledger-wallet +[Installing Oasis App on Your Ledger Wallet]: ../../general/manage-tokens/holding-rose-tokens/ledger-wallet.md ### Instructions - Before upgrade diff --git a/docs/node/run-your-node/advanced/using-ledger-backed-consensus-key-with-a-remote-signer.md b/docs/node/run-your-node/advanced/using-ledger-backed-consensus-key-with-a-remote-signer.md index b1a9adeab7..1f9f9e1205 100644 --- a/docs/node/run-your-node/advanced/using-ledger-backed-consensus-key-with-a-remote-signer.md +++ b/docs/node/run-your-node/advanced/using-ledger-backed-consensus-key-with-a-remote-signer.md @@ -22,7 +22,7 @@ Before following this guide, make sure you've followed the [Prerequisites](../pr Also make sure you've followed the [Install Oasis Remote Signer Binary](install-oasis-remote-signer-binary.md) section and have the Oasis Remote Signer binary installed on your remote signer system where your Ledger wallet will be connected. -Finally, you need to do steps described in the [Setup](../../../oasis-core-ledger/usage/setup.md) section of our [Oasis Core Ledger docs](../../../oasis-core-ledger). Make sure you also install the _**OasisVal**_** app** on your Ledger wallet. +Finally, make sure you install the _**OasisVal**_** app** on your Ledger wallet. ## Set Up Remote Signer System diff --git a/docs/oasis-core-ledger b/docs/oasis-core-ledger deleted file mode 120000 index da39005393..0000000000 --- a/docs/oasis-core-ledger +++ /dev/null @@ -1 +0,0 @@ -../external/oasis-core-ledger/docs \ No newline at end of file diff --git a/external/oasis-core-ledger b/external/oasis-core-ledger deleted file mode 160000 index 67060bdf75..0000000000 --- a/external/oasis-core-ledger +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 67060bdf75b28b1fc5f868ca62f03687e4153fcb diff --git a/redirects.js b/redirects.js index 0450333cdf..b6823af73c 100644 --- a/redirects.js +++ b/redirects.js @@ -129,6 +129,19 @@ const redirectsOptions = { to: '/general/manage-tokens/', from: '/general/manage-tokens/overview', // #200 Restructure docs }, + { + to: '/general/manage-tokens/holding-rose-tokens/ledger-wallet/', + from: [ + '/oasis-core-ledger', // #626 Deprecate oasis-core-ledger + '/oasis-core-ledger/usage/setup', // #626 Deprecate oasis-core-ledger + '/oasis-core-ledger/usage/address', // #626 Deprecate oasis-core-ledger + '/oasis-core-ledger/usage/entity', // #626 Deprecate oasis-core-ledger + '/oasis-core-ledger/usage/transactions', // #626 Deprecate oasis-core-ledger + '/oasis-core-ledger/usage/wallets', // #626 Deprecate oasis-core-ledger + '/oasis-core-ledger/versioning', // #626 Deprecate oasis-core-ledger + '/oasis-core-ledger/release-process', // #626 Deprecate oasis-core-ledger + ] + }, { to: '/general/oasis-network/', from: '/general/oasis-network/overview', // #200 Restructure docs diff --git a/sidebarCore.js b/sidebarCore.js index f095d231ef..9a29c804da 100644 --- a/sidebarCore.js +++ b/sidebarCore.js @@ -157,11 +157,6 @@ const sidebars = { }, ], }, - { - type: 'link', - label: 'Oasis Core Ledger', - href: '/oasis-core-ledger' - }, { type: 'link', label: 'ADRs', diff --git a/sidebarOasisCoreLedger.js b/sidebarOasisCoreLedger.js deleted file mode 100644 index f01970fe04..0000000000 --- a/sidebarOasisCoreLedger.js +++ /dev/null @@ -1,35 +0,0 @@ -// @ts-check - -/** @type {import('@docusaurus/plugin-content-docs').SidebarsConfig} */ -const sidebars = { - oasisSdk: [ - { - type: 'doc', - label: 'Introduction to Oasis Core Ledger', - id: 'oasis-core-ledger/README', - }, - { - type: 'category', - label: 'Usage', - collapsible: false, - items: [ - 'oasis-core-ledger/usage/setup', - 'oasis-core-ledger/usage/address', - 'oasis-core-ledger/usage/entity', - 'oasis-core-ledger/usage/transactions', - 'oasis-core-ledger/usage/wallets', - ], - }, - { - type: 'category', - label: 'Processes', - collapsible: false, - items: [ - 'oasis-core-ledger/versioning', - 'oasis-core-ledger/release-process', - ], - }, - ], -}; - -module.exports = sidebars; diff --git a/sidebars.js b/sidebars.js index b06ca87f11..6735f3eee1 100644 --- a/sidebars.js +++ b/sidebars.js @@ -7,7 +7,6 @@ const sidebars = { ...require('./sidebarDapp.js'), ...require('./sidebarParatime.js'), ...require('./sidebarCore.js'), - ...require('./sidebarOasisCoreLedger.js'), ...require('./sidebarAdrs.js'), ...require('./sidebarGetInvolved.js'), };