Skip to content
This repository has been archived by the owner on Aug 7, 2024. It is now read-only.

Commit

Permalink
Merge pull request #57 from BitSwap-BiFi/22388o-patch-30
Browse files Browse the repository at this point in the history
Add RGB Core v0.11.0, Bitcoin protocol and many more upgrades
  • Loading branch information
Rsync25 authored Nov 13, 2023
2 parents f63025f + bc1a35a commit 96308d0
Show file tree
Hide file tree
Showing 3 changed files with 55 additions and 15 deletions.
61 changes: 48 additions & 13 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,17 @@ bp-core = "tapret, op"


[core_functions]
rgb-core = "0.10.8"
rgb-core = "0.11.0-beta.1"
rust-dlc = "0.4"
bitswap = "1.0.11"
rust-aluvm = "0.10.5"
bitswap = "1.0.13"
rust-aluvm = "0.11.0-alpha.1"
rust-lighting = "0.0.118"
rust-baid58 = "0.4.0"
rgb-wallet = "0.10.8"
carbonado ="0.3.3"
bp-std = "0.11.0"
bp-std = "0.11.0-beta.1"
rgb-schemata = "0.10.0"
strict_types = "~1.6.3"



# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
Expand All @@ -44,9 +45,9 @@ required-features = ["stl"]

[dependencies]
strict_encoding = "~2.3.1"
strict_types = "~1.2.0"
bp-core = { version = "~0.10.7" }
aluvm = { version = "~0.10.5", features = ["std"] }
strict_types = "~1.6.3"
bp-core = { version = "~0.11.0" }
aluvm = { version = "~0.11.0-alpha.1", features = ["std"] }
commit_verify = { version = "~0.10.3", features = ["rand", "derive"] }
single_use_seals = "~0.10.0"
baid58 = "0.4.0"
Expand All @@ -68,7 +69,7 @@ aluvm = { version = "~0.10.6", features = ["std"] }
commit_verify = { version = "~0.10.6", features = ["rand", "derive"] }
single_use_seals = "~0.10.1"
bp-core = { version = "~0.10.10" }
secp256k1-zkp = { version = "0.9.2", features = ["rand", "rand-std", "global-context"] }
secp256k1-zkp = { version = "0.28.0", features = ["rand", "rand-std", "global-context"] }
baid58 = "~0.4.4"
mime = "~0.3.17"
serde_crate = { package = "serde", version = "1", features = ["derive"], optional = true }
Expand Down Expand Up @@ -120,15 +121,15 @@ features.strict_encoding = ["0.9.0"]
features.thiserror = ["1.0"]
features.tokio-util = { version = "0.7.4", features = ["codec"] }

[rgb_wallet]
[rgb_std]

amplify = "4.0.1"
baid58 = "0.4.4"
strict_encoding = "2.5.0"
strict_types = "1.6.0"
commit_verify = { version = "0.10.5", features = ["stl"] }
bp-core = { version = "0.10.8", features = ["stl"] }
rgb-core = { version = "0.10.7", features = ["stl"] }
bp-core = { version = "0.11.0", features = ["stl"] }
rgb-core = { version = "0.11.0", features = ["stl"] }

[ldk]

Expand All @@ -139,7 +140,7 @@ lightning-persister = { version = "0.0.116", path = "../lightning-persister" }


bech32 = { version = "0.9.0", default-features = false }
secp256k1 = { version = "0.24.0", default-features = false, features = ["recovery", "alloc"] }
secp256k1 = { version = "0.28.0", default-features = false, features = ["recovery", "alloc"] }
num-traits = { version = "0.2.8", default-features = false }
bitcoin_hashes = { version = "0.11", default-features = false }
hashbrown = { version = "0.8", optional = true }
Expand Down Expand Up @@ -217,6 +218,11 @@ bp-primitives = "0.10.7"
serde_crate = { package = "serde", version = "1", features = ["derive"] }
serde_with = "3.1.0"

bp-consensus = { version = "0.11.0-beta.1", path = "consensus" }
bp-dbc = { version = "0.11.0-beta.1", path = "./dbc" }
bp-seals = { version = "0.11.0-beta.1", path = "./seals" }
secp256k1 = { version = "0.28.0", features = ["global-context"] }

[payjoin]
anyhow = "1.0.70"
base64 = "0.21.2"
Expand Down Expand Up @@ -278,6 +284,11 @@ bp-dbc = { workspace = true }
bp-seals = { workspace = true }
serde_crate = { workspace = true, optional = true }

[strict_type]
strict_encoding = { version = "2.6.1", features = ["derive", "float"] }
sha2 = "0.10.8"
base64 = { version = "0.21.4", optional = true }

[rgb_schemata]
amplify = "4.5.0"
strict_encoding = "2.6.1"
Expand All @@ -289,6 +300,30 @@ serde = "1.0"
serde_json = "1.0"
sha2 = "0.10.7"

[bifrost]
amplify = { version = "3.13.0", features = ["hex", "rand"] }
lnpbp = "0.9.0"
bp-core = "0.11.0"
strict_encoding = { version = "0.11.0", optional = true, features = ["chrono", "miniscript"] }
lightning_encoding = { version = "0.9.0", optional = true }
bitcoin_scripts = "0.9.0"
psbt = "0.9.0"
miniscript = "9.0.0"
bitcoin = "0.29.2"
secp256k1 = { version = "0.28.0", features = ["global-context"] }
internet2 = { version = "0.9.0-rc.1", default-features = false, features = ["derive"] }
serde_crate = { package = "serde", version = "1", features = ["derive"], optional = true }
serde_with = { version = "1.14", features = ["hex"], optional = true }
once_cell = "1.12.0"
chrono = "0.4"


default = ["bolt", "strict_encoding"]
all = ['bifrost', "serde"]
bolt = ["lightning_encoding", "strict_encoding"] # Remove strict encoding requirement
bifrost = ["strict_encoding", "bolt"]
serde = ["serde_crate", "serde_with", "amplify/serde", "bitcoin/serde"]

[profile.release]
panic = "abort"

Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,13 @@ You can add in your cargo.toml

```cargo.toml
[package]
rgb-core = "0.10.8"
rgb-core = "0.11.0"
rust-dlc = "0.4"
bitswap = "1.0.9"
rust-aluvm = "0.10.5"
rust-baid58 = "0.4.4"
rust-lightning = "0.0.118"
bp-core = "0.11.0"
```
### Via CLI Command

Expand Down
6 changes: 5 additions & 1 deletion src/contract/asset.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use std::baid58;
use std::amplify;


use rgb_core::{Consignment, Contract, Error, ExecutionResult, Schema, Value, State};
use rgb_core::{Consignment, Contract, Error, ExecutionResult, Schema, Value, State, Tag};
use baid58::{Baid58ParseError, Chunking, FromBaid58, ToBaid58, CHUNKING_32};
use aluvm::library::{Lib, LibSite};
use rgbstd::interface::{rgb20, rgb20_stl, IfaceImpl, NamedField, NamedType, VerNo};
Expand All @@ -15,6 +15,10 @@ use rgbstd::stl::StandardTypes;
use rgbstd::vm::{AluScript, ContractOp, EntryPoint, RgbIsa};
use strict_types::{SemId, Ty};
use amplify::{ByteArray, Bytes32};
use commit_verify::{CommitEncode, CommitVerify, CommitmentProtocol, Conceal, UntaggedProtocol};
use rgb::{U8, Bytes32};
use rgb::{ContractSchema};
use rgb::mod::{ContractSubSchema};
use std::collections::HashMap;

struct RGB20Asset {
Expand Down

0 comments on commit 96308d0

Please sign in to comment.