Skip to content

Dswap dca merge to master #81

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lion-200 merged 15 commits into from
Apr 23, 2025
Merged

Dswap dca merge to master #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
ca64980
Dswap DCA
Mar 10, 2025
b9a2137
Various styling fixes
Mar 12, 2025
742fd40
layout fixes dca
Mar 13, 2025
cecc22e
Cancel DCA changes
Mar 14, 2025
8da3d8a
bugfixing
Mar 16, 2025
a6fada3
Various changes and fixes after initial QA testing
Mar 18, 2025
5031af3
minor fixes
Mar 18, 2025
1e5eb07
Validation and fixes
Mar 19, 2025
8eaddaf
ssl
Mar 20, 2025
29bec8a
get disabled tokens from tribaldex, minor fixes
Mar 25, 2025
4434532
tokenimage fixes
Mar 25, 2025
420b98a
github links added to faq
Apr 2, 2025
3f6ebb5
Move to prod
Apr 3, 2025
b80768a
FAQ changes
Apr 23, 2025
60b5c79
package.json fix
Apr 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions aurelia_project/environments/base.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,20 @@ export const baseEnvironmentConfiguration: Partial<IEnvironment> = {
FIREBASE_API_SE: 'https://us-central1-steem-engine-dex.cloudfunctions.net/api/',
EXCHANGE_URL_HE: 'https://hive-engine.com/',
EXCHANGE_URL_SE: 'https://steem-engine.net/',
/*DSWAP_API_URL: 'http://localhost:37322/api/',*/
//DSWAP_API_URL: 'http://localhost:37322/api/',
//DSWAP_API_URL: 'https://qa.dswap.trade:37322/api/',
//DSWAP_API_URL: 'https://qa-dswap-api.dswap.trade/api/',
DSWAP_API_URL: 'https://dswap-api.dswap.trade/api/',
/*DSWAP_API_URL: 'https://dswap.azurewebsites.net/api/',*/
BLOCK_EXPLORER_HE: 'https://he.dtools.dev/',
BLOCK_EXPLORER_SE: 'https://se.dtools.dev/',
DSWAP_API_VERSION: '2.0',
TRIBALDEX_API_URL: 'https://api.tribaldex.com/',
DSWAP_API_VERSION: '3.0',
DSWAP_ACCOUNT_HE: 'dswap',
DSWAP_SOURCE_ID: '5fab0821cdef24759c5ae9a9',
maintenanceMode: false,
swapEnabledTokens: ['BEE', 'DEC', 'KANDA', 'SAND', 'SWAP.BCH', 'SWAP.BTC', 'SWAP.BTS', 'SWAP.DOGE', 'SWAP.ENG', 'SWAP.EOS', 'SWAP.GOLOS', 'SWAP.HBD', 'SWAP.LTC', 'SWAP.SBD', 'SWAP.STEEM', 'SWAP.SWIFT', 'SWAP.TLOS', 'WEED', 'WORKERBEE', 'PAL', 'LEO', 'SWAP.HIVE', 'PLOT'],
swapEnabledCrypto: ['STEEM', 'SBD', 'HBD', 'EOS', 'BTS', 'BTC', 'LTC', 'SWIFT', 'BCH', 'DOGE'],
swapEnabledTokens: ['BEE', 'DEC'],//, 'KANDA', 'SAND', 'SWAP.BCH', 'SWAP.BTC', 'SWAP.BTS', 'SWAP.DOGE', 'SWAP.ENG', 'SWAP.EOS', 'SWAP.GOLOS', 'SWAP.HBD', 'SWAP.LTC', 'SWAP.SBD', 'SWAP.STEEM', 'SWAP.SWIFT', 'SWAP.TLOS', 'WEED', 'WORKERBEE', 'PAL', 'LEO', 'SWAP.HIVE', 'PLOT'],
swapEnabledCrypto: [],//'STEEM', 'SBD', 'HBD', 'EOS', 'BTS', 'BTC', 'LTC', 'SWIFT', 'BCH', 'DOGE'],
disabledTokens: ['BTC', 'LTC', 'STEEM', 'SBD', 'HIVE', 'HBD', 'BCC', 'XAP', 'XRP', 'GOLOS', 'DISNEY', 'AMAZON', 'VOICE', 'ETH', 'EOS', 'DONE', 'BNB', 'LASSE', 'R', 'SCTR', 'ALLAH', 'ETHER', 'LTCPEG', 'SBC', 'TEST.EON', 'BEEHIVE', 'BEECASH', 'SPL.FUND', 'ATOM.TOKEN', 'DSWAP', 'LEOG', 'PAK', 'APXM', 'LBIM', 'BROAG', 'COIN.HONEY', 'CUB', 'ENJ', 'GUILD', 'RAFFLE', 'CUNT', 'FQX', 'FOX', 'MOOBEE', 'BUILD'],
disabledTokens_SE: ['BTC', 'LTC', 'STEEM', 'SBD', 'BCC', 'XAP', 'XRP', 'GOLOS', 'DISNEY', 'AMAZON', 'VOICE', 'ETH', 'EOS', 'LASSE', 'TIME', 'R', 'SCTR', 'ALLAH', 'DONE', 'BNB', 'ETHER', 'LTCPEG', 'SBC', 'LASSECASH', 'HIVE', 'TIX', 'TIXM', 'STEM', 'STEMM', 'LEO', 'LEOM', 'LEOMM', 'NEO', 'NEOX', 'PORN', 'SPORTS', 'BATTLE', 'SIM', 'CTP', 'CTPM', 'EMFOUR', 'CCC', 'CCCM', 'BEER', 'WEED', 'WEEDM', 'WEEDMM', 'SPACO', 'SPACOM', 'NEOXAG', 'NEOXAGM', 'KANDA', 'SAND', 'INFOWARS', 'SPI', 'PAL', 'PALM', 'PALMM', 'ENGAGE', 'BRO', 'CC', 'BUILDTEAM', 'ECO', 'GAMER', 'EPC', 'SPT', 'JAHM'],
peggedToken: 'SWAP.HIVE',
Expand All @@ -40,6 +43,9 @@ export const baseEnvironmentConfiguration: Partial<IEnvironment> = {
dswapEnabled: true,
marketMakerEnabled: true,
dswapPaused: false,
dswapDcaFee: 0.25,
dswapDcaCancelFee: 0.001,
settings: null,
features: {
nfts: {
enabled: true
Expand Down
94 changes: 94 additions & 0 deletions custom_typings/interfaces.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ interface IEnvironment {
DSWAP_SOURCE_ID: string;
BLOCK_EXPLORER_HE: string;
BLOCK_EXPLORER_SE: string;
TRIBALDEX_API_URL: string;
dswapEnabled: boolean;
dswapPaused: boolean;
marketMakerEnabled: boolean;
Expand All @@ -36,6 +37,7 @@ interface IEnvironment {
swapEnabledCrypto: string[];
disabledTokens: string[];
disabledTokens_SE: string[];
settings: any;
peggedToken: string;
peggedToken_SE: string;
features: any;
Expand All @@ -50,6 +52,8 @@ interface IEnvironment {
marketMakerFeeToken_SE: string;
isDebug: boolean;
debugAccount: string;
dswapDcaFee: number;
dswapDcaCancelFee: number;
}

interface IState {
Expand Down Expand Up @@ -322,6 +326,7 @@ interface ISwapRequestViewModel {
timestamp_year: string;
CreatedAt: string;
SwapStatusId: number;
SwapStatusName: string;
}

interface ISwapRequestTransactionViewModel {
Expand Down Expand Up @@ -352,3 +357,92 @@ interface ISwapCalcValuesModel {
Chain?: number;
BaseTokenAmount?: number;
}

/* DCA */
interface ISwapRequestDCAModel {
Account: string;
TokenInput: string;
TokenInputAmount: number;
TokenOutput: string;
Chain: number;
ChainTransactionId: string;
SwapSourceId: string;
TokenInputMemo: string;
RecurrenceTypeAmount: number,
RecurrenceType: string,
OrderCount: number
}

interface ISwapRequestDCAResponseModel {
Id: string;
Account: string;
TokenInput: string;
TokenInputAmount: number;
TokenOutput: string;
Chain: number;
ChainTransactionId: string;
SwapSourceId: string;
TokenInputMemo: string;
RecurrenceTypeAmount: number,
RecurrenceType: string,
OrderCount: number
}

interface ISwapRequestDCAViewModel {
Id: string;
Account: string;
TokenInput: string;
TokenInputAmount: number;
TokenOutput: string;
TokenOutputAmount: number;
TokenOutputAmountActual: number;
Chain: number;
ChainTransactionId: string;
SwapSourceId: string;
timestamp_month_name: string;
timestamp_day: string;
timestamp_time: string;
timestamp_year: string;
CreatedAt: string;
SwapStatusId: number;
SwapStatusName: string;
RecurrenceTypeAmount: number,
RecurrenceType: string,
OrderCount: number
TokenInputMemo: string;
CancelRequested: boolean;
}

interface ISwapRequestDCADetailViewModel {
SwapRequestDCA: ISwapRequestDCAViewModel;
SwapRequests: ISwapRequestViewModel[];
DCARefunds: ISwapRequestTransactionViewModel[];
}

interface IDCACancelRequestModel {
Account: string;
Chain: number;
ChainTransactionId: string;
DCAId: string;
SourceId: string;
TokenInputMemo: string;
Message: string;
}

interface IDCACancelViewModel {
Id: string;
Account: string;
Chain: number;
ChainTransactionId: string;
CreatedAt: string;
DCAId: string;
Message: string;
SourceId: string;
StatusId: number;
StatusName: string;
timestamp_month_name: string;
timestamp_day: string;
timestamp_time: string;
timestamp_year: string;
TokenInputMemo: string;
}
Binary file added dist.zip
View file
Open in desktop
Binary file not shown.
Loading
Loading