Merge pull request #127 from BitSwap-BiFi/main

Fix updates

.env → .env.sample

@@ -2,22 +2,31 @@
 
 BITCOIN_NODE_SERVER =
 ELECTRUM_API_SERVER =
-BITCOIN_API_EXPLORER_MAINNET =
+BITCOIN_API_EXPLORER_MAINNET = false
 BITCOIN_API_EXPLORER_TESTNET = 
+BITCOIN_API_EXPLORER_SIGNET = false 
 APP_DIR=.rgb-proxy-server
 
-# LN
+# lightning network 
 
-LNNDHUB_ENDPOINT =
 RGB_LIGHTNING_NODE = 
 
-# bitswap
+
+# oracle
+
+ORACLE_ENDPOINT = 
+ORACLE_PUBKEY = 
+
+# web 
+
+LOCAL_HOST = 
+
+# network 1
 
 STRESS_TEST=false
 BITCOIN_NETWORK_MAINNET=false
 BITCOIN_NETWORK_SIGNET=false
 BITCOIN_NETWORK_TESTNET=true
-BITSWAP_ENDPOINT=
 
 ## dex
 
@@ -26,7 +35,7 @@ DEX_SEED=
 # 0.5...1
 DEX_FEE_PERC=
 
-# network 
+# network  2
 
 BITCOIN_NETWORK_TESTNET=https://mempool.space/testnet
 BITCOIN_NETWORK_MAINNET=https://mempool.space/

.github/workflows/docs.yml

@@ -0,0 +1,30 @@
+name: Publish docs
+
+on:
+ push:
+ branches:
+ - master
+
+jobs:
+ docs:
+ name: Publish docs
+ runs-on: ubuntu-22.04
+
+ steps:
+ - uses: actions/checkout@v4
+ - uses: actions/setup-rust@1
+ with:
+ name: fedimint
+ authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
+ continue-on-error: true
+
+ - name: Build docs
+ run: cargo doc --no-deps
+
+ - if: github.repository == 'BiSwap/Bitswap'
+ name: Deploy docs
+ uses: peaceiris/actions-gh-pages@v3
+ with:
+ github_token: ${{ secrets.GITHUB_TOKEN }}
+ publish_dir: ./result/
+ cname: https://bitswap-bifi.github.io/Bitswap-core/

CHANGELOG.md

@@ -4,7 +4,12 @@ See last versions and releases around Bitswap development
 
 ## Alpha v1.0.17
 
-TBA
+**Highlights**
+
+- Fixed Cargo.toml with LDK and RGB
+- RGB PSBT
+- OP_RETURN
+- Fixed typos
 
 ## Alpha v1.0.16
 

CONTRIBUTING.md

@@ -2,6 +2,7 @@
 
 - If your find some bug, please open "Issue"
 - If you want make a new upgrade or feature, please open PR
+- We not 'listing' token on Core
 - We'll not integrate with sidechains or altcoins (chains) on DEX
 - We'll not support Taproot Assets, Runes, Ordinals, NFTs, etc
 - Check our [ossification DEX](https://github.com/BitSwap-BiFi/Bitswap-core/tree/main#ossification-dex)

Cargo.toml

@@ -6,35 +6,35 @@ members = ["rgb-core", "rust-dlc", "bitswap", "payjoin", "aluvm", "baid58"]
 name = "Bitswap-Core"
 version = "1.0.17-alpha"
 edition = "2021"
-description = "AMM DEX on RGB Protocol"
+description = "AMM DEX on RGB Protocol and Lightning Network"
 license = "Business Source License 1.1"
 
 [memmbers]
 
-swap = "algorithm, dlc"
+swap = "amm, dlc"
 dlc = "message"
-algorithm = "amm contract"
-ldk = "invoice"
+amm_contract = "amm contract"
+ldk = "invoice, paymenthash, rgb_assets"
 
 [dex.dependencies]
 swap = "pairs, ldk"
 bp-core = "tapret, op"
 
 
 [core_functions]
-rgb-core = "0.11.0-beta.3" 
+rgb-core = "0.11.0-beta.4" 
 rust-dlc = "0.4"
 bitswap = "1.0.13"
-rust-aluvm = "0.11.0-beta.3"
+rust-aluvm = "0.11.0-beta.4"
 rust-lighting = "0.0.118"
 rust-baid58 = "0.4.0"
-bp-std = "0.11.0-beta.3"
-bp-core="v0.11.0-beta.3"
-rgb-std = "0.11.0-beta.3"
-payjoin = "0.12.0"
-rgb-schemata = "0.11.0-beta.3"
+bp-std = "0.11.0-beta.4"
+bp-core="v0.11.0-beta.4"
+rgb-std = "0.11.0-beta.4"
+payjoin = "0.13.0"
+rgb-schemata = "0.11.0-beta.4"
 strict_types = "1.6.3"
-rgb-runtime = "0.11.0-beta.1"
+rgb-runtime = "0.11.0-beta.4"
 
 
 
@@ -50,12 +50,12 @@ required-features = ["stl"]
 [dependencies]
 strict_encoding = "~2.3.1"
 strict_types = "~1.6.3"
-bp-core = { version = "~0.11.0-alpha.3 }
+bp-core = { version = "~0.11.0-alpha.4"}
 aluvm = { version = "~0.11.0-beta.3", features = ["std"] }
 commit_verify = { version = "~0.10.3", features = ["rand", "derive"] }
 single_use_seals = "~0.10.0"
 baid58 = "0.4.0"
-rgb-std = { version = "0.11.0-beta.3", optional = true }
+rgb-std = { version = "0.11.0-beta.4", optional = true }
 psbt = { workspace = true }
 
 [lihghtning]
@@ -71,10 +71,10 @@ lightning-rapid-gossip-sync = { version = "0.0.119" }
 amplify = "~4.5.0"
 strict_encoding = "~2.6.1"
 strict_types = "~1.6.3"
-aluvm = { version = "~0.11.0-beta.1", features = ["std"] }
+aluvm = { version = "~0.11.0-beta.4", features = ["std"] }
 commit_verify = { version = "~0.10.6", features = ["rand", "derive"] }
 single_use_seals = "~0.10.1"
-bp-core = { version = "~0.10.10" }
+bp-core = { version = "~0.11.0" }
 secp256k1-zkp = { version = "0.28.0", features = ["rand", "rand-std", "global-context"] }
 baid58 = "~0.4.4"
 mime = "~0.3.17"
@@ -135,15 +135,15 @@ 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.11.0", features = ["stl"] }
-rgb-core = { version = "0.11.0", features = ["stl"] }
+bp-core = { version = "0.11.0-beta.4", features = ["stl"] }
+rgb-core = { version = "0.11.0-beta.4, features = ["stl"] }
 
 [ldk]
 
 tokio = { version = "1.14", features = [ "macros", "rt", "rt-multi-thread", "sync", "time" ] }
-lightning = { version = "0.0.117", path = "../lightning", features = ["_test_utils"] }
+lightning = { version = "0.0.119", path = "../lightning", features = ["_test_utils"] }
 lightning-invoice = { version = "0.24.0", path = "../lightning-invoice" }
-lightning-persister = { version = "0.0.116", path = "../lightning-persister" }
+lightning-persister = { version = "0.0.119", path = "../lightning-persister" }
 
 
 bech32 = { version = "0.9.0", default-features = false }
@@ -161,7 +161,7 @@ bitcoin = {version = "0.29.2"}
 dlc = {version = "0.4.0", path = "../dlc"}
 dlc-messages = {version = "0.4.0", path = "../dlc-messages"}
 dlc-trie = {version = "0.4.0", path = "../dlc-trie"}
-lightning = {version = "0.0.116" }
+lightning = {version = "0.0.119" }
 log = "0.4.14"
 rand_chacha = {version = "0.3.1", optional = true}
 serde = {version = "1.0", optional = true}
@@ -185,7 +185,7 @@ simple-wallet = {path = "../simple-wallet"}
 
 bitcoin = {version = "0.29.2"}
 dlc = {version = "0.4.0", path = "../dlc"}
-lightning = {version = "0.0.116" }
+lightning = {version = "0.0.119" }
 secp256k1-zkp = {version = "0.7.0", features = ["bitcoin_hashes", "rand", "rand-std"]}
 serde = {version = "1.0", features = ["derive"], optional = true}
 
@@ -310,7 +310,7 @@ sha2 = "0.10.7"
 [bifrost]
 amplify = { version = "3.13.0", features = ["hex", "rand"] }
 lnpbp = "0.9.0"
-bp-core = "0.11.0"
+bp-core = "0.11.0-beta.4"
 strict_encoding = { version = "0.11.0", optional = true, features = ["chrono", "miniscript"] }
 lightning_encoding = { version = "0.9.0", optional = true }
 bitcoin_scripts = "0.9.0"

README.md

@@ -64,15 +64,14 @@ How there's no lunch free, you can lose sats in these scenarios:
 
 ## Roadmap
 
-- [x] CLI 
+- [x] CLI powered by RGB CLI
 - [x] On-Chain RGB Assets with Swap using [Bitcoin Protocol](https://github.com/BP-WG/bp-core)
 - [x] RGB PSBT
 - [x] RGB wallet (new version stable)
 - [x] DLC Off chain thought Lightning swaps
 - [x] Payjoin and Taproot full implementation (WIP)
 - [x] Complete PRs pendents (WIP)
 - [x] Add [RGB CLI](https://github.com/RGB-WG/rgb) as tool complementary for CLI from DEX
-- [x] Integration with Bitlight wallet (WIP)
 - [x] OP_RETURN (WIP)
 - [x] API integration from RLN (WIP)
 - [x] RGB Proxy (WIP)
@@ -85,17 +84,18 @@ How there's no lunch free, you can lose sats in these scenarios:
 - [x] Prime (WIP)
 - [x] Complete PRs pendents (WIP)
 - [x] WASM (WIP)
-- [ ] RGB Core, STD, BP, AluVM and many more to v0.11 - Part.2
+- [x] RGB Core, STD, BP, AluVM and many more to v0.11 - Part.2 (WIP)
+- [x] AMM lib (WIP)
+- [x] Web server and domain
 - [ ] Liquid integration
 - [ ] User friendly UI for allow mint tokens, send, receive and swap tokens on Lightning Network and DEX
 - [ ] Taproot Channels by LDK
 - [ ] Mainnet
 - [ ] Beta app
 - [ ] UI/UX
-- [x] Web server and domain
 - [ ] Official USDT implementation by Bitifinex
 - [ ] Integration with APIs from [RGBex](https://rgbex.io/)
-- [ ] Bitlight Wallet
+- [ ] [Bitlight Wallet](https://bitlightlabs.com)
 - [ ] [BitMask](https://bitmask.app/)
 - [ ] Storm
 - [ ] Contractrum

doc/architecture.md

@@ -20,4 +20,5 @@ Discover architecture repository about Bitswap
 - Liquid: TBD
 - Prime: TBD
 - Bifrost: TBD
+- Storm: TBD
 

server/amm/src/lib.rs

@@ -0,0 +1 @@
+

src/Cargo.toml

@@ -1,4 +1,18 @@
 [package]
 
-name = "Core"
+name = "Src_core"
 version = "1.0.17-alpha"
+lib =
+bifrost = 
+lightning =
+bitcoin =
+error =
+proxy =
+rgb =
+testnet =
+validators =
+util = 
+web =
+struct = 
+constants = 
+

src/aluvm/Cargo.toml

@@ -0,0 +1,3 @@
+[workspcae]
+name = "src/aluvm"
+version = "1.0.17-alpha"

src/cli/Cargo.toml

@@ -0,0 +1,6 @@
+[workspace]
+
+cli = "1.0.17-alpha"
+
+[dev.depedencies]
+src = "cli"

src/cli/cli.rs

@@ -1,3 +1,8 @@
+use ldk::wallet::Wallet;
+use rgb::core::contract::Contract;
+use rgb::core::fungible::{Mint, OutpointValue, ValueSum};
+use rgb::core::issue::Amount;
+use rgb_contract::cli;
 use lightning::wallet::Wallet;
 use rgbstd::interface::{Mint, OutpointValue, ValueSum, Amount, ContractID};
 use std::error::Error;
@@ -34,10 +39,7 @@ fn main() -> Result<(), Box<dyn Error>> {
  match args[0] {
  "swaps" => {
  let swap = swap::BTC();
- let swap = swap::USDT();
- }
- "mint" => {
- let mint = mint::USDT();
+ let swap = swap::RGB20();
  }
  "enable_channel" => {
  let channel = open::new();
@@ -51,13 +53,13 @@ fn main() -> Result<(), Box<dyn Error>> {
  "enter_liquidity" => {
  let mut input = String::new();
  let input = asset::BTC:();
- let input = asset::USDT();
+ let input = asset::RGB20();
 
  }
  "exit_liquidity" => {
  let mut output = String::new();
  let output = asset::BTC:();
- let output = asset::USDT();
+ let output = asset::RGB20();
  }
  "exit" => {
  // Exit the program