Merge branch 'main' into dependabot/cargo/oauth2-5.0.0

web3infra-foundation · Feb 5, 2025 · 18adb82 · 18adb82
2 parents 66052f5 + dec8d2f
commit 18adb82
Show file tree

Hide file tree

Showing 37 changed files with 482 additions and 262 deletions.
diff --git a/.github/ISSUE_TEMPLATE/pre-task.md b/.github/ISSUE_TEMPLATE/pre-task.md
@@ -0,0 +1,12 @@
+---
+name: pre-task
+about: r2cn 测试任务模板
+title: "[libra] "
+labels: libra, pre-task
+assignees: ''
+
+---
+
+[具体描述] XXX 命令 YYY 参数的具体功能描述
+
+[实现方案]
diff --git a/.github/ISSUE_TEMPLATE/r2cn.md b/.github/ISSUE_TEMPLATE/r2cn.md
@@ -7,26 +7,27 @@ assignees: ''
 
 ---
 
-[标题] 为xxx实现xxx功能
+[任务]
 
-[任务分值] xx分（根据任务分级自评）
+[任务分值] 4 分
 
-[背景描述] 描述产品及特性
+[背景描述]
 
-[需求描述] 目前需要开发的特性
+[需求描述]
 
-[环境要求] 描述开发环境
+[代码标准]
 
-[产出标准] xxx
+1. 所有 PR 提交必须签署 `Signed-off-by` 和 使用 `GPG` 签名，即提交代码时（使用 `git commit` 命令时）至少使用 `-s -S` 两个参数；
+2. 所有 PR 提交必须通过 `GitHub Actions` 自动化测试；
+3. PR 提交内容和代码注释均需要使用英文；
 
-[PR 提交地址] 仓库xxx分支的xxx目录
+[PR 提交地址] 提交到 [mega](https://github.com/web3infra-foundation/mega) 仓库的 `main` 分支
 
-[期望完成时间] 202x年xx月xx日
+[开发指导]
 
-[开发指导] 参考资料等
+[导师及邮箱] 请申请此题目的同学使用邮件联系导师，或加入到 [R2CN Discord](https://discord.gg/WRp4TKv6rh) 后在 `#p-meta` 频道和导师交流。
 
-[导师及邮箱] YYY <[email protected]>
+1. Quanyi Ma <[email protected]>
+2. Tianxing Ye <[email protected]>
 
-[备注] xxx
-
-[标签] r2cn
+[备注]
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -79,53 +79,3 @@ jobs:
           # For pull requests, export results to the build cache.
           # Otherwise, push to a registry.
           outputs: ${{ github.event_name == 'pull_request' && 'type=cacheonly' || 'type=registry' }}
-  aries:
-    runs-on: ubuntu-latest
-    if: github.repository_owner == 'genedna'
-    steps:
-      - name: Log in to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ vars.DOCKER_USER }}
-          password: ${{ secrets.DOCKER_PAT }}
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-        with:
-          version: "lab:latest"
-          driver: cloud
-          endpoint: "${{ vars.DOCKER_USER }}/mono"
-          platforms: linux/amd64,linux/arm64
-          install: true
-      - name: Build and push
-        uses: docker/build-push-action@v6
-        with:
-          tags: "${{ vars.DOCKER_USER }}/mono:aries-engine-latest"
-          file: docker/aries-engine-dockerfile-hub
-          # For pull requests, export results to the build cache.
-          # Otherwise, push to a registry.
-          outputs: ${{ github.event_name == 'pull_request' && 'type=cacheonly' || 'type=registry' }}
-  mega:
-    runs-on: ubuntu-latest
-    if: github.repository_owner == 'genedna'
-    steps:
-      - name: Log in to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ vars.DOCKER_USER }}
-          password: ${{ secrets.DOCKER_PAT }}
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-        with:
-          version: "lab:latest"
-          driver: cloud
-          endpoint: "${{ vars.DOCKER_USER }}/mono"
-          platforms: linux/amd64,linux/arm64
-          install: true
-      - name: Build and push
-        uses: docker/build-push-action@v6
-        with:
-          tags: "${{ vars.DOCKER_USER }}/mono:mega-engine-latest"
-          file: docker/mega-engine-dockerfile-hub
-          # For pull requests, export results to the build cache.
-          # Otherwise, push to a registry.
-          outputs: ${{ github.event_name == 'pull_request' && 'type=cacheonly' || 'type=registry' }}
diff --git a/Cargo.toml b/Cargo.toml
@@ -36,53 +36,53 @@ libra = { path = "libra" }
 
 anyhow = "1.0.93"
 serde = "1.0.215"
-serde_json = "1.0.132"
+serde_json = "1.0.138"
 tracing = "0.1.40"
 tracing-subscriber = "0.3.19"
 tracing-appender = "0.2"
-thiserror = "2.0.9"
-rand = "0.8.5"
+thiserror = "2.0.11"
+rand = "0.9.0"
 smallvec = "1.13.2"
 tokio = "1.42"
 tokio-stream = "0.1.17"
 tokio-test = "0.4.4"
-clap = "4.5.23"
-async-trait = "0.1.83"
+clap = "4.5.28"
+async-trait = "0.1.86"
 async-stream = "0.3.6"
-bytes = "1.8.0"
+bytes = "1.10.0"
 memchr = "2.7.4"
 chrono = "0.4.39"
 sha1 = "0.10.6"
 futures = "0.3.30"
 futures-util = "0.3.30"
 go-defer = "0.1.0"
-russh = "0.49.0"
-russh-keys = "0.49.1"
+russh = "0.50.0"
+# russh-keys = "0.49.2"
 axum = "0.8.1"
 axum-extra = "0.10.0"
 axum-server = "0.7.1"
 tower-http = "0.6.1"
 tower = "0.5.2"
 hex = "0.4.3"
-sea-orm = "1.1.3"
+sea-orm = "1.1.4"
 flate2 = "1.0.35"
-bstr = "1.11.0"
+bstr = "1.11.3"
 colored = "3.0.0"
 idgenerator = "2.0.0"
 num_cpus = "1.16.0"
-config = "0.15.4"
+config = "0.15.7"
 shadow-rs = "0.36.0"
 reqwest = "0.12.12"
 lazy_static = "1.5.0"
-uuid = "1.11.0"
+uuid = "1.13.1"
 regex = "1.11.1"
 ed25519-dalek = "2.1.1"
 ctrlc = "3.4.4"
 git2 = "0.20.0"
-tempfile = "3.14.0"
+tempfile = "3.16.0"
 home = "0.5.9"
 ring = "0.17.8"
-cedar-policy = "4.2.2"
+cedar-policy = "4.3.1"
 secp256k1 = "0.30.0"
 oauth2 = "5.0.0"
 base64 = "0.22.1"

diff --git a/aria/contents/docs/libra/command/add/index.mdx b/aria/contents/docs/libra/command/add/index.mdx
@@ -1,12 +1,8 @@
 ---
 title: The [add] Command
-description:
+description: Add file contents to the index
 ---
 
-# add
-
-**Add file contents to the index**
-
 ### Usage
 
 libra add \[OPTIONS\] \[PATHSPEC\]...
@@ -31,4 +27,4 @@ This command updates the index using the current content found in the working tr
     Update the index just where it already has an entry matching **pathspec**. This removes as well as modifies index entries to match the working tree, but adds no new files
 
 -   `-v`, `--verbose`
-    more detailed output
+    more detailed output
diff --git a/aria/contents/docs/libra/command/branch/index.mdx b/aria/contents/docs/libra/command/branch/index.mdx
@@ -1,12 +1,8 @@
 ---
 title: The [branch] Command
-description:
+description: List, create, or delete branches
 ---
 
-# branch
-
-**List, create, or delete branches**
-
 ### Usage
 
 libra branch [OPTIONS] [NEW_BRANCH] [COMMIT_HASH]
@@ -24,17 +20,17 @@ If a new branch name is given, a new branch is created that points to the given
 
 ### Options
 
--   `-l`, `--list`  
+-   `-l`, `--list`
     List all branches, don't include remote branches. The order is not guaranteed, mostly it is sorted by the created order.
--   `-D`, `--delete <DELETE>`  
+-   `-D`, `--delete <DELETE>`
     Force delete branch
--   `-u`, `--set-upstream-to <SET_UPSTREAM_TO>`  
+-   `-u`, `--set-upstream-to <SET_UPSTREAM_TO>`
     Set up `<branchname>`'s tracking information so `<upstream>` is considered `<branchname>`'s upstream branch.
--   `--show-current`  
+-   `--show-current`
     Show current branch
--   `-r`, `--remotes`  
+-   `-r`, `--remotes`
     Show remote branches
--   `-h`, `--help`  
+-   `-h`, `--help`
     Print help
 
 <Note type="note" title="Note">

diff --git a/aria/contents/docs/libra/command/clone/index.mdx b/aria/contents/docs/libra/command/clone/index.mdx
@@ -1,12 +1,8 @@
 ---
 title: The [clone] Command
-description:
+description: Clone a repository into a new directory
 ---
 
-# clone
-
-**Clone a repository into a new directory**
-
 ### Usage
 
 libra clone `<REMOTE_REPO>` [LOCAL_PATH]

diff --git a/aria/contents/docs/libra/command/commit/index.mdx b/aria/contents/docs/libra/command/commit/index.mdx
@@ -1,12 +1,8 @@
 ---
 title: The [commit] Command
-description:
+description: Record changes to the repository
 ---
 
-# commit
-
-**Record changes to the repository**
-
 ### Usage
 
 libra commit [OPTIONS] --message \<MESSAGE\>

diff --git a/aria/contents/docs/libra/command/diff/index.mdx b/aria/contents/docs/libra/command/diff/index.mdx
@@ -1,12 +1,8 @@
 ---
 title: The [diff] Command
-description:
+description: Show different between files
 ---
 
-# diff
-
-**Show different between files**
-
 ### Usage
 
 libra diff [OPTIONS] [PATHSPEC]...

diff --git a/aria/contents/docs/libra/command/fetch/index.mdx b/aria/contents/docs/libra/command/fetch/index.mdx
@@ -1,12 +1,8 @@
 ---
 title: The [fetch] Command
-description:
+description: Download objects and refs from another repository
 ---
 
-# fetch
-
-**Download objects and refs from another repository**
-
 ### Usage
 
 libra fetch [OPTIONS] [REPOSITORY] [REFSPEC]
@@ -26,7 +22,7 @@ When no remote is specified, by default the current branch's config remote is us
 
 ### Options
 
--   `-a`, `--all`  
+-   `-a`, `--all`
      Fetch all remotes
 -   `-h`, `--help`
 

diff --git a/aria/contents/docs/libra/command/index-pack/index.mdx b/aria/contents/docs/libra/command/index-pack/index.mdx
@@ -1,12 +1,8 @@
 ---
 title: The [index-pack] Command
-description:
+description: Build pack index file for an existing packed archive
 ---
 
-# index-pack
-
-**Build pack index file for an existing packed archive**
-
 ### Usage
 
 libra index-pack \[OPTIONS\] \<PACK_FILE\>

diff --git a/aria/contents/docs/libra/command/init/index.mdx b/aria/contents/docs/libra/command/init/index.mdx
@@ -1,21 +1,29 @@
 ---
 title: The [init] Command
-description:
+description: Create an empty Libra repository
 ---
 
-# init
-
-**Create an empty Libra repository**
-
 ### Usage
 
-libra init
+libra init [OPTIONS]
 
 ### Description
 
 This command creates the necessary directories and files for a new Libra repository.
 It also sets up the database and the initial configuration.
+By default, the repository is initialized with a .libra directory.
+You can initialize a bare repository with the --bare flag,
+which sets up the repository without a working directory, containing only Libra data.
 
 ### Options
 
--   `-h`, `--help` Print help
+-   `--bare`
+    Initialize a bare repository.
+    <Note type="danger" title="Git bare VS Libra bare">
+    **Note**：Unlike Git's `--bare`, the Libra init `--bare` initializes a bare repository that contains Libra's own SQLite database.
+    </Note>
+-   `-b`, `--initial-branch <INITIAL_BRANCH>`
+    Override the name of the initial branch
+-   `-h`, `--help` Print help
+-   `[directory]`
+    Initialize the repository with specified directory
diff --git a/aria/contents/docs/libra/command/lfs/index.mdx b/aria/contents/docs/libra/command/lfs/index.mdx
@@ -1,12 +1,8 @@
 ---
 title: The [lfs] Command
-description:
+description: Work with large files in Libra repositories
 ---
 
-# lfs
-
-**Work with large files in Libra repositories**
-
 ### Usage
 
 libra lfs \<COMMAND\> \[\<args\>\]
@@ -55,4 +51,4 @@ Show information about Libra LFS files in the index and working tree.<br/>
 
     Libra LFS is mainly designed for monorepo, which has different LFS server discovery mechanism from git-lfs.
     However, it made special support for GitHub and Gitee.
-</Note>
+</Note>
diff --git a/aria/contents/docs/libra/command/log/index.mdx b/aria/contents/docs/libra/command/log/index.mdx
@@ -1,12 +1,8 @@
 ---
 title: The [log] Command
-description:
+description: Show commit logs
 ---
 
-# log
-
-**Show commit logs**
-
 ### Usage
 
 libra log [OPTIONS]
@@ -24,7 +20,7 @@ List commits that are reachable by current local branch. The order is from the l
 
 ### Options:
 
--   `-n`, `--number <NUMBER>`  
+-   `-n`, `--number <NUMBER>`
     Limit the number of output
 -   `-h`, `--help`
     Print help