Merge pull request ordinals#60 from okx/bugfix/reverse_merge_0.6.4

Bugfix/reverse merge 0.6.4

CHANGELOG.md

@@ -1,6 +1,12 @@
 Changelog
 =========
 
+[0.6.4](https://github.com/okx/ord/releases/tag/0.6.4) - 2023-05-21
+---------------------------------------------------------------------
+### New Feature
+- Support BRC20 protocol
+- Add RESTful API for BRC20 protocol (#48)
+
 [0.5.2](https://github.com/casey/ord/releases/tag/0.5.2) - 2023-04-17
 ---------------------------------------------------------------------
 

Cargo.toml

@@ -1,14 +1,15 @@
 [package]
 name = "ord"
 description = "◉ Ordinal wallet and block explorer"
-version = "0.5.2"
+version = "0.6.4"
 license = "CC0-1.0"
 edition = "2021"
 autotests = false
 homepage = "https://github.com/casey/ord"
 repository = "https://github.com/casey/ord"
 autobins = false
 rust-version = "1.67"
+build = "build.rs"
 
 [workspace]
 members = [".", "test-bitcoincore-rpc"]
@@ -60,6 +61,7 @@ tokio-util = {version = "0.7.3", features = ["compat"] }
 tower-http = { version = "0.3.3", features = ["compression-br", "compression-gzip", "cors", "set-header"] }
 bincode = "1.3.3"
 bigdecimal = "0.3.1"
+shadow-rs = "0.21.0"
 
 [dev-dependencies]
 executable-path = "1.0.0"
@@ -82,6 +84,7 @@ path = "tests/lib.rs"
 
 [build-dependencies]
 pulldown-cmark = "0.9.2"
+shadow-rs = "0.21.0"
 
 [features]
 rollback = []

build.rs

@@ -0,0 +1,3 @@
+fn main() -> shadow_rs::SdResult<()> {
+  shadow_rs::new()
+}

src/arguments.rs

@@ -1,7 +1,9 @@
 use super::*;
 
+use shadow_rs::shadow;
+shadow!(build);
 #[derive(Debug, Parser)]
-#[clap(version)]
+#[clap(version(build::CLAP_LONG_VERSION))]
 pub(crate) struct Arguments {
   #[clap(flatten)]
   pub(crate) options: Options,

src/brc20/error.rs

@@ -55,8 +55,8 @@ pub enum BRC20Error {
   #[error("decimals {0} too large")]
   DecimalsTooLarge(u8),
 
-  #[error("invalid bigInt {0}")]
-  InvalidBigInt(Num),
+  #[error("invalid integer {0}")]
+  InvalidInteger(Num),
 
   #[error("tick: {0} has been minted")]
   TickMinted(String),