From 5dc7a77e43f7a8e6e696ca1c09a43d5c2e0044de Mon Sep 17 00:00:00 2001 From: Uthpala Heenatigala Date: Fri, 6 Jan 2023 00:41:15 +0100 Subject: [PATCH] running format and adding sqlite db to mock_data.zip --- .../deezy/templates/deezy/index.html | 181 +++++++++++++----- tests/data/mock_data.zip | Bin 42862 -> 43064 bytes 2 files changed, 130 insertions(+), 51 deletions(-) diff --git a/lnbits/extensions/deezy/templates/deezy/index.html b/lnbits/extensions/deezy/templates/deezy/index.html index 6dcad038..3b7a205a 100644 --- a/lnbits/extensions/deezy/templates/deezy/index.html +++ b/lnbits/extensions/deezy/templates/deezy/index.html @@ -5,15 +5,26 @@
Deezy
-

Due to regulatory reasons you need to get a access token from deezy. Contact - support@deezy.io or @dannydeezy on telegram

+

+ Due to regulatory reasons you need to get a access token from deezy. + Contact - support@deezy.io or @dannydeezy on telegram +

Deezy token - Add or Update token + Add or Update token

- + - + @@ -239,22 +246,83 @@ data: function () { return { columnsLnToBtc: [ - { name: 'amount_sats',label: 'Amount Sats', align: 'left', field: 'amount_sats', sortable: true}, - { name: 'on_chain_address', align: 'left', label: 'On chain address', field: 'on_chain_address' }, - { name: 'on_chain_sats_per_vbyte', align: 'left', label: 'Onchin sats per vbyte', field: 'on_chain_sats_per_vbyte', sortable: true }, - { name: 'fee_sats', label: 'Fee sats', align: 'left',field: 'fee_sats' }, - { name: 'txid', label: 'Tx Id',align: 'left', field: 'txid' }, - { name: 'tx_hex', label: 'Tx Hex',align: 'left', field: 'tx_hex' }, - { name: 'created_at', label: 'Created at',align: 'left', field: 'created_at', sortable: true, sort: true } + { + name: 'amount_sats', + label: 'Amount Sats', + align: 'left', + field: 'amount_sats', + sortable: true + }, + { + name: 'on_chain_address', + align: 'left', + label: 'On chain address', + field: 'on_chain_address' + }, + { + name: 'on_chain_sats_per_vbyte', + align: 'left', + label: 'Onchin sats per vbyte', + field: 'on_chain_sats_per_vbyte', + sortable: true + }, + { + name: 'fee_sats', + label: 'Fee sats', + align: 'left', + field: 'fee_sats' + }, + {name: 'txid', label: 'Tx Id', align: 'left', field: 'txid'}, + {name: 'tx_hex', label: 'Tx Hex', align: 'left', field: 'tx_hex'}, + { + name: 'created_at', + label: 'Created at', + align: 'left', + field: 'created_at', + sortable: true, + sort: true + } ], rowsLnToBtc: [], columnsBtcToLn: [ - { name: 'ln_address', align: 'left', label: 'Ln Address or Invoice', field: 'ln_address' }, - { name: 'on_chain_address', align: 'left', label: 'Onchain Address', field: 'on_chain_address' }, - { name: 'secret_access_key', align: 'left', label: 'Onchain Address', field: 'secret_access_key' }, - { name: 'commitment', align: 'left', label: 'Commitment', field: 'commitment' }, - { name: 'signature', align: 'left', label: 'Signature', field: 'signature' }, - { name: 'created_at', label: 'Created at', field: 'created_at', align: 'left', sortable: true, sort: true } + { + name: 'ln_address', + align: 'left', + label: 'Ln Address or Invoice', + field: 'ln_address' + }, + { + name: 'on_chain_address', + align: 'left', + label: 'Onchain Address', + field: 'on_chain_address' + }, + { + name: 'secret_access_key', + align: 'left', + label: 'Onchain Address', + field: 'secret_access_key' + }, + { + name: 'commitment', + align: 'left', + label: 'Commitment', + field: 'commitment' + }, + { + name: 'signature', + align: 'left', + label: 'Signature', + field: 'signature' + }, + { + name: 'created_at', + label: 'Created at', + field: 'created_at', + align: 'left', + sortable: true, + sort: true + } ], rowsBtcToLn: [], showDeezyTokenForm: false, @@ -304,7 +372,7 @@ var self = this axios({ method: 'GET', - url: '/deezy/api/v1/token', + url: '/deezy/api/v1/token' }).then(function (response) { self.storedDeezyToken = response.data.deezy_token if (!self.storeDeezyToken) { @@ -357,13 +425,15 @@ invoicePaid: true, onchainTxId: response.data.on_chain_txid } - self.updateLnToBtc({ - txid: response.data.on_chain_txid, - tx_hex: response.data.tx_hex, - bolt11_invoice: self.swapLnToBtc.response - }).then(() => { - self.getLnToBtc() - }) + self + .updateLnToBtc({ + txid: response.data.on_chain_txid, + tx_hex: response.data.tx_hex, + bolt11_invoice: self.swapLnToBtc.response + }) + .then(() => { + self.getLnToBtc() + }) clearInterval(interval) } }) @@ -376,17 +446,21 @@ sendLnToBtc() { var self = this axios - .post('https://api.deezy.io/v1/swap', { - amount_sats: parseInt(self.swapLnToBtc.data.amount), - on_chain_address: self.swapLnToBtc.data.on_chain_address, - on_chain_sats_per_vbyte: parseInt( - self.swapLnToBtc.data.on_chain_sats_per_vbyte - ) - }, { - headers: { - "x-api-token": self.storedDeezyToken, + .post( + 'https://api.deezy.io/v1/swap', + { + amount_sats: parseInt(self.swapLnToBtc.data.amount), + on_chain_address: self.swapLnToBtc.data.on_chain_address, + on_chain_sats_per_vbyte: parseInt( + self.swapLnToBtc.data.on_chain_sats_per_vbyte + ) + }, + { + headers: { + 'x-api-token': self.storedDeezyToken + } } - }) + ) .then(function (response) { self.swapLnToBtc = { ...self.swapLnToBtc, @@ -394,11 +468,12 @@ response: response.data.bolt11_invoice } const payload = { - amount_sats: parseInt(self.swapLnToBtc.data.amount), - on_chain_address: self.swapLnToBtc.data.on_chain_address, - on_chain_sats_per_vbyte: self.swapLnToBtc.data.on_chain_sats_per_vbyte, + amount_sats: parseInt(self.swapLnToBtc.data.amount), + on_chain_address: self.swapLnToBtc.data.on_chain_address, + on_chain_sats_per_vbyte: + self.swapLnToBtc.data.on_chain_sats_per_vbyte, bolt11_invoice: response.data.bolt11_invoice, - fee_sats: response.data.fee_sats, + fee_sats: response.data.fee_sats } self.storeLnToBtc(payload) self.checkIfInvoiceIsPaid() @@ -410,13 +485,17 @@ sendBtcToLn() { var self = this axios - .post('https://api.deezy.io/v1/source', { - lnurl_or_lnaddress: self.swapBtcToLn.data.lnurl_or_lnaddress - }, { - headers: { - "x-api-token": self.storedDeezyToken, + .post( + 'https://api.deezy.io/v1/source', + { + lnurl_or_lnaddress: self.swapBtcToLn.data.lnurl_or_lnaddress + }, + { + headers: { + 'x-api-token': self.storedDeezyToken + } } - }) + ) .then(function (response) { self.swapBtcToLn = { ...self.swapBtcToLn, @@ -427,7 +506,7 @@ ln_address: self.swapBtcToLn.data.lnurl_or_lnaddress, on_chain_address: response.data.address, secret_access_key: response.data.secret_access_key, - commitment:response.data.commitment, + commitment: response.data.commitment, signature: response.data.signature } self.storeBtcToLn(payload) @@ -470,7 +549,7 @@ }) .then(function (response) { self.storedDeezyToken = response.data - self.showDeezyTokenForm = false + self.showDeezyTokenForm = false }) .catch(function (error) { console.log(error) diff --git a/tests/data/mock_data.zip b/tests/data/mock_data.zip index 4070bee77ec1fa4608772d0a0410320ea798e860..d5169e128e9d84563a8f8e090ea1e0346bb03308 100644 GIT binary patch delta 1915 zcmaENj%mjQCcXe~W)=|!5MX0f3!BI%uX#6qdom1{R&X;gvV3J^U;rzEDCS_`U;rx) z)8vLJd=tNY@_uQpiCf|r*G?8@v}Nvz-@ZARF`Joj?W73`lkc<0fJOeXq%bkAot(_> z1m><_zs1P7c5*YPFEhk|_{m0G8jNcvM{_xX70lsB$r-$N z8M`OD@mYdJAlkGhZ{RayTr>GOpB-462LDnv#GYY7J6l`Lvupy+{NX$A#`-2CM1_>{zwME%r?lK7O=)T&Co;=-KF zl2qf+5MBm${rK(4APkBfj3{IWnF=$F0TiVWiw>rI41o(XFfdH!4%64~iQk?~gb5-H zphRJ@c5-$YB1Xa^0WkqNmmm1n3%hJLMOlElbfu)L=GILD#^Qf86zh@D1d~xOyO2(aN?Y_ z6p}Utd*3mE1RybNKS2cMm`xFrqbIqM=9tZEC!beWnC!hw0c^MEWKWoB2U8~h4ON)@ zUY&LF{$&ydBn9xnl#i3oi^@+{TMkLoV$&utvVgMUF;UXEPu(gwuW_W`f22#h=zIO7t8D4O1&DzP9GXs#ht7b-nV-Tcw!rIAdv;5(* zTHTYU&9VV!MNsAhsnF`4{C$=?SO{j}_cfD~XZyf4&0ahC!fanScgfnxc5@KUS+aKW zsyShB3sP2)^0xVraK-D_PBvKJ4wu~}IC;hb4=7hel8YIVGBL8_WPye9vUs!L0vogA=8hH=B>+(m{^O|pz@C+`P~-B|=PNJJ3BQIic8i!!$+Fif^i z(1PlekvCoYBjoL_WW&dd3=9ko3=A?TPJTam!(y0;GEAD?lm9N3VX{e{EWJbzW&)Fb z_TszrzsSI=E z1cu3i6SSdbAiS_Cq9+s_kdxOh6=mKsiD7ciBvYs=8K%u^C(ACAVbYvD*?O4)RFv2_ z**kUe#>HZj4=fXhYLwvuMdFL36GbVElON6#VbYv7S!}t!Cf2OX$_8?k8iN{xx&Q;i I@97{O05CFjegFUf delta 1799 zcmdmSf$7~jCcXe~W)=|!5U`!x6FQMkUQ;}5dNK@`R&X;gvV3J^U;rzEDCS_`U;rx) z)8vLJbPSt5dB3#Q#4T}*TPF)M+A<#sp1wJlF`Joj>*W0`Hel{QmJ}w&t&@}4oxt1` z?6(*hw@z;6^ks(Vj-PDArNOv$ax|ACSiyX*$xMusCmZwXvHu93p8PR%`s57WyNr`3 zyYX4FJBCe9hG^58yn)Y*dCQNG$zI8FliB&@z?wDqm$ET#ogApDFgbpXJXlCTtP^Da zED4C~Zb{4pabHGiPo6I=3w1*~5E9z}z2l;vlYoBE&cTiuxeW z)vLHewZ>1@P}N}EGC5Gy9;|+{sx?Ucd36UcS4acw`*JOBxOx?BO~$R0{j@E?3c9rC zF)~U{*3`8EbJKMDH8?~VK!JTQXY$FZ3X^{>lr=mQJUtmLQkWS6yxBQGF~|fW7#J83 z(PXi8@+=93$*GHE!Db4DUjsSmWuyn(4U?llLB1yn;>iC|dq4{I#6m*gS8P8M!VMD> ztVy-sbnE2b2@ta^6Zt@~>5**5EFLy}b7%5yUdF`9u7wcKHx_P{1}7DT$)}defE`=b z`wrxm{VWQTTPHw-mP`8j%>j z2Xj77J})Xi`NMKZ5-XoJfsqB2Hzsq>(1m9X@v!NW1!u}YB$8*C!zDloSa7BcQ`pwY zhi7<$oHSW*rYz&u$@(+Bpgb9-nyr&(%?v>1a?gqe#~(=Rgsqd?XZgcrwI)ygKFbE4 zUqC9fCQpu-?GDc{AffMDCLfvY1J^Wr>tw?@zF=*S`n zo?xXQgOs*Telr(gQ2N%%k@FBPPv1KE$h=Uv-d|fLTg``91JbLvb@Gb&esH7owoVpb z5D8bje(U6k3*6zdyCf(7T;KuY3Leb)7y?S{uoN#hxp1L8D1*RM$Xjgv5mFQ?vt%_$ zNdW_c9D@Q#0~jx9jGr8`NDro#1EjWUX