Merge pull request #972 from oasisprotocol/matevz/docs/rofl

external: Bump cli
oasisprotocol · Oct 10, 2024 · 9e62942 · 9e62942
2 parents b4b701b + 6ac9c7d
commit 9e62942
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 4 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,7 +1,7 @@
 [submodule "external/oasis-core"]
 	path = external/oasis-core
 	url = https://github.com/oasisprotocol/oasis-core
-	branch = stable/24.0.x
+	branch = stable/24.2.x
 [submodule "external/oasis-sdk"]
 	path = external/oasis-sdk
 	url = https://github.com/oasisprotocol/oasis-sdk

diff --git a/external/cli b/external/cli
diff --git a/external/oasis-core b/external/oasis-core
diff --git a/sidebarGeneral.ts b/sidebarGeneral.ts
@@ -87,6 +87,7 @@ export const sidebarGeneral: SidebarsConfig = {
             'general/manage-tokens/cli/account',
             'general/manage-tokens/cli/transaction',
             'general/manage-tokens/cli/addressbook',
+            'general/manage-tokens/cli/rofl',
           ]
         },
         'general/manage-tokens/faq',

diff --git a/src/editUrl.ts b/src/editUrl.ts
@@ -5,7 +5,7 @@ import type { EditUrlFunction } from '@docusaurus/plugin-content-docs'
 const gitModules = {
     'external/adrs/': 'https://github.com/oasisprotocol/adrs/{mode}/main/',
     'external/cli/': 'https://github.com/oasisprotocol/cli/{mode}/master/',
-    'external/oasis-core/': 'https://github.com/oasisprotocol/oasis-core/{mode}/stable/22.2.x/',
+    'external/oasis-core/': 'https://github.com/oasisprotocol/oasis-core/{mode}/stable/24.2.x/',
     'external/oasis-sdk/': 'https://github.com/oasisprotocol/oasis-sdk/{mode}/main/',
     'external/sapphire-paratime/': 'https://github.com/oasisprotocol/sapphire-paratime/{mode}/main/',
 };

diff --git a/src/remark/cross-repo-links.ts b/src/remark/cross-repo-links.ts
@@ -5,6 +5,7 @@ import {visit} from 'unist-util-visit';
 const cliRegex = /https:\/\/github\.com\/oasisprotocol\/cli\/blob\/master\/docs\/(.*)\.mdx?(#.*)?/;
 const oasisSdkContractRegex = /https:\/\/github\.com\/oasisprotocol\/oasis-sdk\/blob\/main\/docs\/contract\/(.*)\.mdx?(#.*)?/;
 const oasisSdkRuntimeRegex = /https:\/\/github\.com\/oasisprotocol\/oasis-sdk\/blob\/main\/docs\/runtime\/(.*)\.mdx?(#.*)?/;
+const oasisSdkRoflRegex = /https:\/\/github\.com\/oasisprotocol\/oasis-sdk\/blob\/main\/docs\/rofl\/(.*)\.mdx?(#.*)?/;
 const oasisCoreRegex = /https:\/\/github\.com\/oasisprotocol\/oasis-core\/blob\/master\/docs\/(.*)\.mdx?(#.*)?/;
 const adrsRegex = /https:\/\/github\.com\/oasisprotocol\/adrs\/blob\/main\/(.*)\.mdx?(#.*)?/;
 const sapphireParatimeRegex = /https:\/\/github\.com\/oasisprotocol\/sapphire-paratime\/blob\/main\/docs\/(.*)\.mdx?(#.*)?/;
@@ -31,6 +32,8 @@ export default function plugin(): Transformer {
             node.url = node.url.replace(oasisSdkContractRegex, '/dapp/cipher/$1$2');
         } else if (oasisSdkRuntimeRegex.test(node.url)) {
             node.url = node.url.replace(oasisSdkRuntimeRegex, '/paratime/$1$2');
+        } else if (oasisSdkRoflRegex.test(node.url)) {
+            node.url = node.url.replace(oasisSdkRoflRegex, '/rofl/$1$2');
         } else if (cliRegex.test(node.url)) {
             node.url = node.url.replace(cliRegex, '/general/manage-tokens/cli/$1$2');
         } else if (oasisCoreRegex.test(node.url)) {
+1 −1		.github/workflows/ci-lint.yml
+3 −0		.github/workflows/release.yml
+49 −6		.goreleaser.yaml
+1 −1		Makefile
+115 −0		build/cargo/cargo.go
+23 −0		build/sgxs/sgxs.go
+1 −1		cmd/contract.go
+90 −54		cmd/network/add_local.go
+2 −1		cmd/network/governance/create.go
+5 −1		cmd/network/remove.go
+2 −2		cmd/network/show.go
+110 −64		cmd/paratime/add.go
+17 −0		cmd/paratime/denomination/denomination.go
+51 −0		cmd/paratime/denomination/remove.go
+49 −0		cmd/paratime/denomination/set-native.go
+64 −0		cmd/paratime/denomination/set.go
+23 −1		cmd/paratime/list.go
+3 −0		cmd/paratime/paratime.go
+347 −0		cmd/rofl/build.go
+76 −0		cmd/rofl/identity.go
+272 −0		cmd/rofl/mgmt.go
+21 −0		cmd/rofl/rofl.go
+55 −0		cmd/rofl/trust_root.go
+2 −0		cmd/root.go
+4 −0		cmd/wallet/export.go
+117 −67		cmd/wallet/import.go
+4 −0		cmd/wallet/show.go
+12 −1		config/config.go
+2 −1		config/default.go
+117 −0		config/migrate.go
+1 −0		docs/README.md
+18 −3		docs/network.md
+36 −0		docs/paratime.md
+202 −0		docs/rofl.md
+18 −0		docs/wallet.md
+1 −0		examples/network-governance/list.out
+1 −0		examples/network/remove-y.in.static
+1 −0		examples/network/remove-y.out.static
+1 −0		examples/paratime-denom/00-denom-set.in
+0 −0		examples/paratime-denom/00-denom-set.out
+1 −0		examples/paratime-denom/01-denom-set-native.in
+0 −0		examples/paratime-denom/01-denom-set-native.out
+1 −0		examples/paratime-denom/02-denom-remove.in
+0 −0		examples/paratime-denom/02-denom-remove.out
+12 −9		examples/paratime-remove/00-list.out
+11 −8		examples/paratime-remove/02-list.out
+11 −8		examples/paratime/00-list.out
+11 −8		examples/paratime/02-list.out
+1 −0		examples/rofl/build-sgx-unsafe.in.static
+1 −0		examples/rofl/build-sgx.in.static
+1 −0		examples/rofl/create-npa.in.static
+1 −0		examples/rofl/create.in.static
+44 −0		examples/rofl/create.out.static
+1 −0		examples/rofl/identity.in.static
+1 −0		examples/rofl/identity.out.static
+1 −0		examples/rofl/remove-npa.in.static
+1 −0		examples/rofl/remove.in.static
+25 −0		examples/rofl/remove.out.static
+1 −0		examples/rofl/show-np.in.static
+1 −0		examples/rofl/show.in.static
+27 −0		examples/rofl/show.out.static
+1 −0		examples/rofl/trust-root-np.in.static
+1 −0		examples/rofl/trust-root.in.static
+6 −0		examples/rofl/trust-root.out.static
+1 −0		examples/rofl/update-npa.in.static
+1 −0		examples/rofl/update-self.in.static
+1 −0		examples/rofl/update.in.static
+44 −0		examples/rofl/update.out.static
+1 −0		examples/setup/first-run.out
+1 −1		examples/transaction/sign.y.out
+1 −0		examples/wallet/import-secp256k1-bip44-y.in.static
+1 −0		examples/wallet/import-secp256k1-bip44-y.out.static
+39 −34		go.mod
+98 −81		go.sum