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 #209 from BitSwap-BiFi/main
Browse files Browse the repository at this point in the history
Fix
  • Loading branch information
22388o authored Mar 13, 2024
2 parents fb76115 + 306b980 commit a7c474e
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 12 deletions.
8 changes: 2 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@

⚠️**Alpha Software and WIP**

⚠️**Unstable Software**

⚠️**Isn't ready to compile via Cargo.lock for while**


**Contributions are welcome**

Expand Down Expand Up @@ -55,7 +51,7 @@ How there's no lunch free, you can lose sats in these scenarios:
- Multipeer channel
- Taproot Channels
- DLC Off chain thought Lightning swaps
- AMM like Uniswap
- AMM as Uniswap
- LSP for RGB20 Assets
- PTLCs
- Musig2
Expand All @@ -66,7 +62,7 @@ How there's no lunch free, you can lose sats in these scenarios:
- Support for Tether and other Stablecoins
- [Cation](https://beta.cation-lang.org/)
- Esplora
- Replace-By-Fee (RBF)
- [Replace-By-Fee (RBF)](https://bitcoinops.org/en/topics/replace-by-fee/)

## Roadmap

Expand Down
1 change: 1 addition & 0 deletions src/dex/assets/swap.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
pub(crate) use rgb_core::{self, fungible::Amount, schema::constants::*, schema::scripts::*, util::Value};
use crate::{CreateSwap,SwapAccepted, PSBT,SwapOut, DLC, Taproot};
pub(crate) use swap::Refund;
use psbt::Psbt;
use rgbstd::{AnchoredBundle, ContractId, Outpoint, Transition};
Expand Down
11 changes: 6 additions & 5 deletions src/dex/functions/main/amm_function.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
// SPDX-License-Identifier:
Business Source License 1.1
//
// Written in 2023 by 22388O and Rsync25
// Written in 2024 by 22388O and Rsync25
//
// Copyright (C) 2023 Bitswap. All rights reserved.
// Copyright (C) 2023 22388O. All rights reserved.
// Copyright (C) 2023 Rsync. All rights reserved.
// Copyright (C) 2024 Bitswap. All rights reserved.
// Copyright (C) 2024 22388O. All rights reserved.
// Copyright (C) 2024 Rsync. All rights reserved.
//
// Licensed under the
Business Source License, 1.1(the "License");
Expand All @@ -18,7 +18,8 @@ Business Source License, 1.1(the "License");
//
// This License does not grant you any right in any trademark or logo of Licensor or its affiliates (provided that you may use a trademark or logo of Licensor as expressly required by this License).TO THE EXTENT PERMITTED BY APPLICABLE LAW, THE LICENSED WORK IS PROVIDED ON AN “AS IS” BASIS. LICENSOR HEREBY DISCLAIMS ALL WARRANTIES AND CONDITIONS, EXPRESS OR IMPLIED, INCLUDING (WITHOUT LIMITATION) WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, AND TITLE. MariaDB hereby grants you permission to use this License’s text to license your works, and to refer to it using the trademark “Business Source License”, as long as you comply with the Covenants of Licensor below

use create::LIBAMMFUNCTION;
use crate::LIBAMMFUNCTION;
use crate::{Swap, AMMContract,Swap, AddLiquidity,CaculateSwap,AMM,OracleInfo,ContractInfo};

Check warning on line 22 in src/dex/functions/main/amm_function.rs

View workflow job for this annotation

GitHub Actions / typos

"Caculate" should be "Calculate".

use rgb_core::{Contract, ExecutionResult};
use aluvm::{Executor, Value, Baid68,SetFailure};
Expand Down
2 changes: 1 addition & 1 deletion src/dex/functions/main/amm_manager.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
pub(crate) use std::U64;
use std::Strict_Types;


use crate::{CostFunctionMarketMaker,CostFunional, MinimalLiquidity};
use super::{AMMError, CostFunctionMarketMaker};
use strict_types::{U64};

Expand Down

0 comments on commit a7c474e

Please sign in to comment.