Merge pull request #460 from nervosnetwork/rc/0.4.4

chore: release mercury v0.4.4 version
nervosnetwork · Oct 8, 2022 · 93082ff · 93082ff
2 parents 0331ef9 + 9fdbbe4
commit 93082ff
Show file tree

Hide file tree

Showing 28 changed files with 208 additions and 42 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# [v0.4.4](https://github.com/nervosnetwork/mercury/compare/v0.4.3...v0.4.4) (2022-10-08)
+
+## 🚀 Features
+
+- feat(rpc): add `extra` para in rpc `get_balance` (#450)
+
 # [v0.4.3](https://github.com/nervosnetwork/mercury/compare/v0.4.2...v0.4.3) (2022-09-19)
 
 ## 🐛 Bug Fixes

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "mercury"
 description = "Mercury is a tool that handles application development on CKB."
-version = "0.4.3"
+version = "0.4.4"
 authors = ["Nervos Network"]
 edition = "2021"
 

diff --git a/common/Cargo.toml b/common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "common"
-version = "0.4.3"
+version = "0.4.4"
 authors = ["Nervos Network"]
 edition = "2021"
 

diff --git a/core/ckb-client/Cargo.toml b/core/ckb-client/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "core-ckb-client"
-version = "0.4.3"
+version = "0.4.4"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

diff --git a/core/cli/Cargo.toml b/core/cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "core-cli"
-version = "0.4.3"
+version = "0.4.4"
 authors = ["Nervos Network"]
 edition = "2021"
 

diff --git a/core/rpc/README.md b/core/rpc/README.md
@@ -116,6 +116,7 @@ The error code ranges are as follows:
   - `item`: [`JsonItem`](#type-jsonitem)
   - `asset_infos`: `Array<`[`AssetInfo`](#type-assetinfo)`>`
   - `tip_block_number`: [`BlockNumber`](#type-blocknumber)`|null`
+  - `extra`: `"Dao"|"Cellbase"|null`
 - result
   - `tip_block_number`: [`BlockNumber`](#type-blocknumber)
   - `balances`: `Array<`[`Balance`](#type-balance)`>`
@@ -135,6 +136,10 @@ To return the balance of specified assets for the given item.
   - If `tip_block_number` is not null, the query is based on the historical blockchain with the specified tip.  
 - `asset_infos` - Specify a set of asset types for the query.
   - If `asset_infos` is empty, the query returns the balance of any asset matching the query parameters.
+- `extra` - Specify the filter applying to the querying.
+  - If `extra` is null, the query does not apply extra filter.
+  - If `extra` is `Dao`, the query will filter and keep the balance of cells that satisfy `type script` as `Dao`.
+  - If `extra` is `Cellbase`, the query will filter and keep the balance of cells satisfying `Cellbase`.
 
 **Returns**
 
@@ -1793,7 +1798,7 @@ echo '{
 {
   "jsonrpc": "2.0", 
   "result": {
-    "mercury_version": "0.4.3", 
+    "mercury_version": "0.4.4", 
     "ckb_node_version": "0.104.0 (4dd90d4 2022-07-19)", 
     "network_type": "Testnet", 
     "enabled_extensions": [ ]
@@ -1837,7 +1842,7 @@ echo '{
 {
   "jsonrpc": "2.0", 
   "result": {
-    "version": "0.4.3", 
+    "version": "0.4.4", 
     "db": "PostgreSQL", 
     "conn_size": 100, 
     "center_id": 0, 

diff --git a/core/rpc/core/Cargo.toml b/core/rpc/core/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "core-rpc"
-version = "0.4.3"
+version = "0.4.4"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

diff --git a/core/rpc/core/src/impl/query.rs b/core/rpc/core/src/impl/query.rs
@@ -55,7 +55,7 @@ impl<C: CkbRpc> MercuryRpcImpl<C> {
                 payload.tip_block_number.map(Into::into),
                 tip_epoch_number.clone(),
                 None,
-                None,
+                payload.extra,
                 &mut PaginationRequest::default(),
             )
             .await?;

diff --git a/core/rpc/types/Cargo.toml b/core/rpc/types/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "core-rpc-types"
-version = "0.4.3"
+version = "0.4.4"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

diff --git a/core/rpc/types/src/lib.rs b/core/rpc/types/src/lib.rs
@@ -323,6 +323,7 @@ pub struct BurnInfo {
 pub struct GetBalancePayload {
     pub item: JsonItem,
     pub asset_infos: HashSet<AssetInfo>,
+    pub extra: Option<ExtraType>,
     pub tip_block_number: Option<BlockNumber>,
 }
 

diff --git a/core/service/Cargo.toml b/core/service/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "core-service"
-version = "0.4.3"
+version = "0.4.4"
 authors = ["Nervos Network"]
 edition = "2021"
 

diff --git a/core/storage/Cargo.toml b/core/storage/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "core-storage"
-version = "0.4.3"
+version = "0.4.4"
 authors = ["Nervos Network"]
 edition = "2021"
 

diff --git a/core/storage/src/relational/insert.rs b/core/storage/src/relational/insert.rs
@@ -22,16 +22,6 @@ pub const BLAKE_160_HSAH_LEN: usize = 20;
 pub const IO_TYPE_INPUT: u8 = 0;
 pub const IO_TYPE_OUTPUT: u8 = 1;
 
-#[macro_export]
-macro_rules! save_batch_slice {
-	($tx: expr$ (, $table: expr)*) => {{
-		$(if $tx.save_batch_slice(&$table, BATCH_SIZE_THRESHOLD, &[]).await.is_err() {
-            $tx.rollback().await?;
-            return Ok(());
-        })*
-	}};
-}
-
 impl RelationalStorage {
     pub(crate) async fn insert_block_table(
         &self,

diff --git a/core/synchronization/Cargo.toml b/core/synchronization/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "core-synchronization"
-version = "0.4.3"
+version = "0.4.4"
 authors = ["Nervos Network"]
 edition = "2021"
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -41,7 +41,7 @@ services:
   mercury:
     container_name: mercury
     restart: always
-    image: nervos/mercury:v0.4.3
+    image: nervos/mercury:v0.4.4
     ports:
       - 8116:8116
     volumes:

diff --git a/docs/migration.md b/docs/migration.md
@@ -1,5 +1,9 @@
 # Migration instruction
 
+## 0.4.4 Release
+
+No migration matters.
+
 ## 0.4.3 Release
 
 No migration matters.

diff --git a/docs/setup.md b/docs/setup.md
@@ -27,7 +27,7 @@ Clone the repository and checkout the tag of the version you intend to use. Usin
 ```sh
 git clone https://github.com/nervosnetwork/mercury.git
 cd mercury
-git checkout v0.4.3
+git checkout v0.4.4
 ```
 
 ### Step 3: Build Mercury
@@ -55,13 +55,13 @@ We will not be building from source, but there are still some valuable files. Cl
 ```sh
 git clone https://github.com/nervosnetwork/mercury.git
 cd mercury
-git checkout v0.4.3
+git checkout v0.4.4
 ```
 
 ### Step 3: Download and Extract a Precompiled Binary
 
 ```sh
-wget https://github.com/nervosnetwork/mercury/releases/download/v0.4.3/mercury-x86_64-unknown-linux-gnu.tar.gz
+wget https://github.com/nervosnetwork/mercury/releases/download/v0.4.4/mercury-x86_64-unknown-linux-gnu.tar.gz
 tar xzf mercury-x86_64-unknown-linux-gnu.tar.gz
 ```
 

diff --git a/integration/Cargo.lock b/integration/Cargo.lock
diff --git a/integration/src/tests/build_adjust_account_transaction.rs b/integration/src/tests/build_adjust_account_transaction.rs
@@ -38,6 +38,7 @@ fn test_adjust_account() {
     let payload = GetBalancePayload {
         item: JsonItem::Address(acp_address.to_string()),
         asset_infos,
+        extra: None,
         tip_block_number: None,
     };
     let response = mercury_client.get_balance(payload.clone()).unwrap();
@@ -79,6 +80,7 @@ fn test_adjust_account_pw_lock() {
     let payload = GetBalancePayload {
         item: JsonItem::Address(pw_lock_address.to_string()),
         asset_infos,
+        extra: None,
         tip_block_number: None,
     };
     let response = mercury_client.get_balance(payload.clone()).unwrap();
@@ -144,6 +146,7 @@ fn test_adjust_account_from_multi() {
     let payload = GetBalancePayload {
         item: JsonItem::Address(acp_address.to_string()),
         asset_infos,
+        extra: None,
         tip_block_number: None,
     };
     let response = mercury_client.get_balance(payload.clone()).unwrap();

diff --git a/integration/src/tests/build_dao_related_transaction.rs b/integration/src/tests/build_dao_related_transaction.rs
@@ -44,6 +44,7 @@ fn test_dao_by_address() {
     let balance_payload = GetBalancePayload {
         item: JsonItem::Address(address.to_string()),
         asset_infos,
+        extra: None,
         tip_block_number: None,
     };
     let balance = mercury_client.get_balance(balance_payload.clone()).unwrap();
@@ -193,6 +194,7 @@ fn test_dao_pool_money() {
     let balance_payload = GetBalancePayload {
         item: JsonItem::Address(address.to_string()),
         asset_infos,
+        extra: None,
         tip_block_number: None,
     };
     let balance = mercury_client.get_balance(balance_payload).unwrap();
@@ -257,6 +259,7 @@ fn test_dao_by_out_point() {
     let balance_payload_1 = GetBalancePayload {
         item: JsonItem::Address(address_1.to_string()),
         asset_infos: asset_infos.clone(),
+        extra: None,
         tip_block_number: None,
     };
     let balance = mercury_client
@@ -270,6 +273,7 @@ fn test_dao_by_out_point() {
     let balance_payload_2 = GetBalancePayload {
         item: JsonItem::Address(address_2.to_string()),
         asset_infos,
+        extra: None,
         tip_block_number: None,
     };
     let balance = mercury_client