From 6198481cbcfb9067404eab2646e6695be41d7d4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?22388o=E2=9A=A1=EF=B8=8F?= <83122757+22388o@users.noreply.github.com> Date: Tue, 31 Oct 2023 15:09:46 -0300 Subject: [PATCH 01/16] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 6991fadc..ffd23ad8 100644 --- a/README.md +++ b/README.md @@ -70,12 +70,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 From 0c86b755770c228f6f85be7458f9bfa00b34adbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?22388o=E2=9A=A1=EF=B8=8F?= <83122757+22388o@users.noreply.github.com> Date: Tue, 31 Oct 2023 15:26:11 -0300 Subject: [PATCH 02/16] Update Cargo.toml --- Cargo.toml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index c8659da1..4af68581 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,14 +21,13 @@ bp-core = "tapret, op" [core_functions] -rgb-core = "0.10.8" +rgb-core = "0.11.0" rust-dlc = "0.4" -bitswap = "1.0.11" +bitswap = "1.0.12" rust-aluvm = "0.10.5" rust-lighting = "0.0.118" rust-baid58 = "0.4.0" rgb-wallet = "0.10.8" -carbonado ="0.3.3" bp-std = "0.11.0" From cf0bf24baa942f925ae8604f0fe591472e44e3f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?22388o=E2=9A=A1=EF=B8=8F?= <83122757+22388o@users.noreply.github.com> Date: Tue, 31 Oct 2023 16:58:21 -0300 Subject: [PATCH 03/16] Update Cargo.toml --- Cargo.toml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 4af68581..c5ed6658 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,7 +21,7 @@ bp-core = "tapret, op" [core_functions] -rgb-core = "0.11.0" +rgb-core = "0.11.0-beta" rust-dlc = "0.4" bitswap = "1.0.12" rust-aluvm = "0.10.5" @@ -43,7 +43,7 @@ required-features = ["stl"] [dependencies] strict_encoding = "~2.3.1" strict_types = "~1.2.0" -bp-core = { version = "~0.10.7" } +bp-core = { version = "~0.11.0" } aluvm = { version = "~0.10.5", features = ["std"] } commit_verify = { version = "~0.10.3", features = ["rand", "derive"] } single_use_seals = "~0.10.0" @@ -66,7 +66,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 } @@ -125,8 +125,8 @@ 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] @@ -137,7 +137,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 } From e346d593e7f8c1110c8eef8285235a2043c4fac7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?22388o=E2=9A=A1=EF=B8=8F?= <83122757+22388o@users.noreply.github.com> Date: Tue, 31 Oct 2023 17:08:11 -0300 Subject: [PATCH 04/16] Update Cargo.toml --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index c5ed6658..28d22933 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,7 +21,7 @@ bp-core = "tapret, op" [core_functions] -rgb-core = "0.11.0-beta" +rgb-core = "0.11.0-beta.1" rust-dlc = "0.4" bitswap = "1.0.12" rust-aluvm = "0.10.5" From 599576d4a8bcf9d6917166500c2bd81b219b1b72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?22388o=E2=9A=A1=EF=B8=8F?= <83122757+22388o@users.noreply.github.com> Date: Fri, 10 Nov 2023 14:15:07 -0300 Subject: [PATCH 05/16] Update Cargo.toml --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 28d22933..a54ea205 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,7 +4,7 @@ members = ["rgb-core", "rust-dlc", "bitswap", "payjoin", "aluvm", "baid58"] [package] name = "Bitswap-Core" -version = "1.0.12-alpha" +version = "1.0.13-alpha" edition = "2021" description = "AMM DEX on RGB Porotocol." license = "Business Source License 1.1" From 1ce5477c684bcb70ee6120abbb348ba99516f637 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?22388o=E2=9A=A1=EF=B8=8F?= <83122757+22388o@users.noreply.github.com> Date: Sat, 11 Nov 2023 06:53:42 -0300 Subject: [PATCH 06/16] Update asset.rs --- src/contract/asset.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/contract/asset.rs b/src/contract/asset.rs index 39c574ac..24e5039a 100644 --- a/src/contract/asset.rs +++ b/src/contract/asset.rs @@ -3,9 +3,11 @@ 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 amplify::{ByteArray, Bytes32}; +use commit_verify::{CommitEncode, CommitVerify, CommitmentProtocol, Conceal, UntaggedProtocol}; +use rgb::{u8, Bytes32}; use std::collections::HashMap; struct RGB20Asset { From c131c05f1f9d6a454d5b50f0ac18c2b1a5676b29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?22388o=E2=9A=A1=EF=B8=8F?= <83122757+22388o@users.noreply.github.com> Date: Sat, 11 Nov 2023 07:33:57 -0300 Subject: [PATCH 07/16] Update asset.rs --- src/contract/asset.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/contract/asset.rs b/src/contract/asset.rs index 24e5039a..936a70ac 100644 --- a/src/contract/asset.rs +++ b/src/contract/asset.rs @@ -7,7 +7,7 @@ use rgb_core::{Consignment, Contract, Error, ExecutionResult, Schema, Value, Sta use baid58::{Baid58ParseError, Chunking, FromBaid58, ToBaid58, CHUNKING_32}; use amplify::{ByteArray, Bytes32}; use commit_verify::{CommitEncode, CommitVerify, CommitmentProtocol, Conceal, UntaggedProtocol}; -use rgb::{u8, Bytes32}; +use rgb::{U8, Bytes32}; use std::collections::HashMap; struct RGB20Asset { From a9a451ada7227070188d7fbcb204a801695d814f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?22388o=E2=9A=A1=EF=B8=8F?= <83122757+22388o@users.noreply.github.com> Date: Sat, 11 Nov 2023 08:56:22 -0300 Subject: [PATCH 08/16] Update asset.rs --- src/contract/asset.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/contract/asset.rs b/src/contract/asset.rs index 936a70ac..3e96d304 100644 --- a/src/contract/asset.rs +++ b/src/contract/asset.rs @@ -8,6 +8,8 @@ use baid58::{Baid58ParseError, Chunking, FromBaid58, ToBaid58, CHUNKING_32}; 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 { From cad07bf4ba90f14a6c289fe48881fdf4126c940e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?22388o=E2=9A=A1=EF=B8=8F?= <83122757+22388o@users.noreply.github.com> Date: Sat, 11 Nov 2023 08:58:54 -0300 Subject: [PATCH 09/16] Update Cargo.toml --- Cargo.toml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index a54ea205..4e9bcedd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,7 +24,7 @@ bp-core = "tapret, op" rgb-core = "0.11.0-beta.1" rust-dlc = "0.4" bitswap = "1.0.12" -rust-aluvm = "0.10.5" +rust-aluvm = "0.11.0-beta1" rust-lighting = "0.0.118" rust-baid58 = "0.4.0" rgb-wallet = "0.10.8" @@ -215,6 +215,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" From 3ba3cb8c157643ca43909c867eadf73c83d63819 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?22388o=E2=9A=A1=EF=B8=8F?= <83122757+22388o@users.noreply.github.com> Date: Sat, 11 Nov 2023 08:59:34 -0300 Subject: [PATCH 10/16] Update Cargo.toml --- Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 4e9bcedd..f650a10f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,11 +24,11 @@ bp-core = "tapret, op" rgb-core = "0.11.0-beta.1" rust-dlc = "0.4" bitswap = "1.0.12" -rust-aluvm = "0.11.0-beta1" +rust-aluvm = "0.11.0-alpha.1" rust-lighting = "0.0.118" rust-baid58 = "0.4.0" rgb-wallet = "0.10.8" -bp-std = "0.11.0" +bp-std = "0.11.0-beta.1" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html From cbe701c12ac83dea69997219326d9806991eccf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rsync=E2=9A=A1=EF=B8=8F?= <135646455+Rsync25@users.noreply.github.com> Date: Sat, 11 Nov 2023 09:05:33 -0300 Subject: [PATCH 11/16] Update Cargo.toml --- Cargo.toml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 137ac411..339fa0e0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,15 +23,12 @@ bp-core = "tapret, op" [core_functions] rgb-core = "0.11.0-beta.1" rust-dlc = "0.4" -bitswap = "1.0.12" +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" bp-std = "0.11.0-beta.1" -======= -carbonado ="0.3.3" -bp-std = "0.11.0" rgb-schemata = "0.10.0" From 3cf434995695429b8e30fae181d0fa50733763bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?22388o=E2=9A=A1=EF=B8=8F?= <83122757+22388o@users.noreply.github.com> Date: Sat, 11 Nov 2023 09:10:08 -0300 Subject: [PATCH 12/16] Update Cargo.toml --- Cargo.toml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 339fa0e0..5481c64b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -30,6 +30,8 @@ rust-baid58 = "0.4.0" rgb-wallet = "0.10.8" 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 @@ -43,9 +45,9 @@ required-features = ["stl"] [dependencies] strict_encoding = "~2.3.1" -strict_types = "~1.2.0" +strict_types = "~1.6.3" bp-core = { version = "~0.11.0" } -aluvm = { version = "~0.10.5", features = ["std"] } +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" From 384fc60abbf344666a1e9caf72eb822a80acaa7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?22388o=E2=9A=A1=EF=B8=8F?= <83122757+22388o@users.noreply.github.com> Date: Sat, 11 Nov 2023 09:15:00 -0300 Subject: [PATCH 13/16] Update Cargo.toml --- Cargo.toml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Cargo.toml b/Cargo.toml index 5481c64b..f7858cff 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -284,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" @@ -295,6 +300,9 @@ serde = "1.0" serde_json = "1.0" sha2 = "0.10.7" +[bifrost] + + [profile.release] panic = "abort" From b599a4511b46092d67f31960e704736105431677 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?22388o=E2=9A=A1=EF=B8=8F?= <83122757+22388o@users.noreply.github.com> Date: Sat, 11 Nov 2023 09:17:29 -0300 Subject: [PATCH 14/16] Update Cargo.toml --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index f7858cff..ff9ff38c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -121,7 +121,7 @@ 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" From b608f7accaa64e0404de6d7b9964fe2253bb9e16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?22388o=E2=9A=A1=EF=B8=8F?= <83122757+22388o@users.noreply.github.com> Date: Sat, 11 Nov 2023 09:32:10 -0300 Subject: [PATCH 15/16] Update Cargo.toml --- Cargo.toml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/Cargo.toml b/Cargo.toml index ff9ff38c..c97fb481 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -301,7 +301,28 @@ 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.9.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" From bc1a35a6f29299b77ba971b7fa02a254eac5b498 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?22388o=E2=9A=A1=EF=B8=8F?= <83122757+22388o@users.noreply.github.com> Date: Sat, 11 Nov 2023 09:36:50 -0300 Subject: [PATCH 16/16] Update Cargo.toml --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index c97fb481..c318e887 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -304,7 +304,7 @@ sha2 = "0.10.7" amplify = { version = "3.13.0", features = ["hex", "rand"] } lnpbp = "0.9.0" bp-core = "0.11.0" -strict_encoding = { version = "0.9.0", optional = true, features = ["chrono", "miniscript"] } +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"