Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/v0.11' into script-refactor
Browse files Browse the repository at this point in the history
  • Loading branch information
dr-orlovsky committed Apr 11, 2024
2 parents d789528 + 6aa7885 commit 9d86073
Show file tree
Hide file tree
Showing 21 changed files with 680 additions and 284 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:
strategy:
fail-fast: false
matrix:
toolchain: [ nightly, beta, stable, 1.70.0 ]
toolchain: [ nightly, beta, stable, 1.75.0 ]
steps:
- uses: actions/checkout@v2
- name: Install rust ${{ matrix.toolchain }}
Expand Down
60 changes: 40 additions & 20 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ categories = ["cryptography::cryptocurrencies"]
readme = "README.md"
license = "Apache-2.0"
edition = "2021"
rust-version = "1.70.0" # Due to TOML dependency in amplify crate
rust-version = "1.75.0"
exclude = [".github"]

[lib]
Expand Down
2 changes: 1 addition & 1 deletion MANIFEST.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Type: Library
Kind: Free software
License: Apache-2.0
Language: Rust
Compiler: 1.70
Compiler: 1.75
Author: Maxim Orlovsky
Maintained: LNP/BP Standards Association, Switzerland
Maintainers:
Expand Down
9 changes: 7 additions & 2 deletions _typos.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,10 @@ extend-exclude = ["stl/"]
[default.extend-words]
# Don't correct the name "Jon Atack".
Atack = "Atack"
# Don't correct the Seh in "pkXwpsb-aemTWhtSg-VDGF25hEi-jtTAnPjzh-B63ZwSehE-WvfhF9".
Seh = "Seh"

[default]
extend-ignore-re = [
# Don't correct RGB address
"[0-9A-Za-z]{7}-[0-9A-Za-z]{9}-[0-9A-Za-z]{9}-[0-9A-Za-z]{9}-[0-9A-Za-z]{9}-[0-9A-Za-z]{7}",
"[0-9A-Za-z]{50}"
]
2 changes: 1 addition & 1 deletion src/bin/rgbcore-stl.rs
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ Bundles vesper lexicon=types+commitments
.unwrap();
let layout = TransitionBundle::commitment_layout();
writeln!(file, "{layout}").unwrap();
let tt = sys.type_tree("RGB.AnchorSet").unwrap();
let tt = sys.type_tree("RGB.DbcProof").unwrap();
writeln!(file, "{tt}").unwrap();
let tt = sys.type_tree("RGB.TransitionBundle").unwrap();
writeln!(file, "{tt}").unwrap();
Expand Down
Loading

0 comments on commit 9d86073

Please sign in to comment.