mirror of
https://github.com/yzernik/squeaknode.git
synced 2026-08-16 13:01:04 +02:00
Fix timestamp in get received payments (#453)
* Fix timestamp in get received payment rpc * Update static build * Fix proto numbering of received payment * Include log line with returned received payments * Lg the received payments reply * Lg received payments reply list * Lg received payments reply list * Fix received payment component * Remove log lines from frontend * Remove log lines for received payment
This commit is contained in:
Jonathan Zernik
GitHub
parent
1724d0dded
commit
2c8d6e0df5
12 changed files with 77 additions and 11 deletions
|
|
@ -28,7 +28,7 @@ export default function ReceivedPayment({
|
|||
|
||||
const history = useHistory();
|
||||
|
||||
const paymentTimeMs = receivedPayment.setPaymentTimeMs();
|
||||
const paymentTimeMs = receivedPayment.getPaymentTimeMs();
|
||||
|
||||
const goToSqueakPage = (hash) => {
|
||||
history.push("/app/squeak/" + hash);
|
||||
|
|
|
|||
|
|
@ -932,6 +932,12 @@ def test_connect_other_node(server_stub, admin_stub, other_server_stub, other_ad
|
|||
for received_payment in get_received_payments_response.received_payments
|
||||
]
|
||||
assert sent_payment.preimage_hash in preimage_hashes
|
||||
for received_payment in get_received_payments_response.received_payments:
|
||||
received_payment_time_ms = received_payment.payment_time_ms
|
||||
print("received_payment_time_ms: {}".format(received_payment_time_ms))
|
||||
received_payment_time = datetime.datetime.fromtimestamp(received_payment_time_ms/1000.0)
|
||||
assert received_payment_time > datetime.datetime.now() - five_minutes
|
||||
assert received_payment_time < datetime.datetime.now()
|
||||
|
||||
|
||||
def test_download_single_squeak(server_stub, admin_stub, other_server_stub, other_admin_stub, lightning_client, signing_profile_id, saved_squeak_hash):
|
||||
|
|
|
|||
|
|
@ -704,5 +704,5 @@ message ReceivedPayment {
|
|||
int64 price_msat = 4;
|
||||
|
||||
/// Time of payment
|
||||
int64 payment_time_ms = 6;
|
||||
int64 payment_time_ms = 5;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -421,7 +421,6 @@ class SqueakAdminServerHandler(object):
|
|||
def handle_get_sent_offers(self, request):
|
||||
logger.info("Handle get sent offers")
|
||||
sent_offers = self.squeak_node.get_sent_offers()
|
||||
logger.info("Sent offers: {}".format(sent_offers))
|
||||
sent_offer_msgs = [sent_offer_to_message(sent_offer) for sent_offer in sent_offers]
|
||||
return squeak_admin_pb2.GetSentOffersReply(
|
||||
sent_offers=sent_offer_msgs,
|
||||
|
|
@ -430,7 +429,6 @@ class SqueakAdminServerHandler(object):
|
|||
def handle_get_received_payments(self, request):
|
||||
logger.info("Handle get received payments")
|
||||
received_payments = self.squeak_node.get_received_payments()
|
||||
logger.info("Received payments: {}".format(received_payments))
|
||||
received_payment_msgs = [received_payments_to_message(received_payment) for received_payment in received_payments]
|
||||
return squeak_admin_pb2.GetReceivedPaymentsReply(
|
||||
received_payments=received_payment_msgs,
|
||||
|
|
|
|||
|
|
@ -158,7 +158,7 @@ class SqueakAdminServerServicer(squeak_admin_pb2_grpc.SqueakAdminServicer):
|
|||
return self.handler.handle_get_sent_offers(request)
|
||||
|
||||
def GetReceivedPayments(self, request, context):
|
||||
return self.handler.handle_get_sent_offers(request)
|
||||
return self.handler.handle_get_received_payments(request)
|
||||
|
||||
def serve(self):
|
||||
server = grpc.server(futures.ThreadPoolExecutor(max_workers=10))
|
||||
|
|
|
|||
|
|
@ -1,8 +1,13 @@
|
|||
import logging
|
||||
|
||||
from squeaknode.server.util import get_hash, get_replyto
|
||||
|
||||
from proto import squeak_admin_pb2, squeak_admin_pb2_grpc
|
||||
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
def squeak_entry_to_message(squeak_entry_with_profile):
|
||||
if squeak_entry_with_profile is None:
|
||||
return None
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{
|
||||
"files": {
|
||||
"main.js": "/static/js/main.07373ac9.chunk.js",
|
||||
"main.js.map": "/static/js/main.07373ac9.chunk.js.map",
|
||||
"main.js": "/static/js/main.2c8f8b20.chunk.js",
|
||||
"main.js.map": "/static/js/main.2c8f8b20.chunk.js.map",
|
||||
"runtime-main.js": "/static/js/runtime-main.9f0ba400.js",
|
||||
"runtime-main.js.map": "/static/js/runtime-main.9f0ba400.js.map",
|
||||
"static/css/2.68adb498.chunk.css": "/static/css/2.68adb498.chunk.css",
|
||||
"static/js/2.b7a6937f.chunk.js": "/static/js/2.b7a6937f.chunk.js",
|
||||
"static/js/2.b7a6937f.chunk.js.map": "/static/js/2.b7a6937f.chunk.js.map",
|
||||
"index.html": "/index.html",
|
||||
"precache-manifest.4c6531577a1c1f3df10925078cd3f770.js": "/precache-manifest.4c6531577a1c1f3df10925078cd3f770.js",
|
||||
"precache-manifest.d241ad5d86ba00b5c82406f4d9dc00ee.js": "/precache-manifest.d241ad5d86ba00b5c82406f4d9dc00ee.js",
|
||||
"service-worker.js": "/service-worker.js",
|
||||
"static/css/2.68adb498.chunk.css.map": "/static/css/2.68adb498.chunk.css.map",
|
||||
"static/js/2.b7a6937f.chunk.js.LICENSE.txt": "/static/js/2.b7a6937f.chunk.js.LICENSE.txt",
|
||||
|
|
@ -20,6 +20,6 @@
|
|||
"static/js/runtime-main.9f0ba400.js",
|
||||
"static/css/2.68adb498.chunk.css",
|
||||
"static/js/2.b7a6937f.chunk.js",
|
||||
"static/js/main.07373ac9.chunk.js"
|
||||
"static/js/main.2c8f8b20.chunk.js"
|
||||
]
|
||||
}
|
||||
|
|
@ -1 +1 @@
|
|||
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="shortcut icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"/><meta name="theme-color" content="#000000"/><link rel="manifest" href="/manifest.json"/><title>Squeak Node</title><meta name="description" content="Squeak Node is a frontend for accessing a squeak node"><meta name="keywords" content="squeak, bitcoin, lightning"><meta name="author" content="Flatlogic LLC."><link href="/static/css/2.68adb498.chunk.css" rel="stylesheet"></head><body style="font-family:Roboto,sans-serif"><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>!function(e){function r(r){for(var n,f,l=r[0],a=r[1],i=r[2],c=0,s=[];c<l.length;c++)f=l[c],Object.prototype.hasOwnProperty.call(o,f)&&o[f]&&s.push(o[f][0]),o[f]=0;for(n in a)Object.prototype.hasOwnProperty.call(a,n)&&(e[n]=a[n]);for(p&&p(r);s.length;)s.shift()();return u.push.apply(u,i||[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,l=1;l<t.length;l++){var a=t[l];0!==o[a]&&(n=!1)}n&&(u.splice(r--,1),e=f(f.s=t[0]))}return e}var n={},o={1:0},u=[];function f(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,f),t.l=!0,t.exports}f.m=e,f.c=n,f.d=function(e,r,t){f.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},f.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},f.t=function(e,r){if(1&r&&(e=f(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(f.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)f.d(t,n,function(r){return e[r]}.bind(null,n));return t},f.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(r,"a",r),r},f.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},f.p="/";var l=this["webpackJsonpsqueak-node-frontend"]=this["webpackJsonpsqueak-node-frontend"]||[],a=l.push.bind(l);l.push=r,l=l.slice();for(var i=0;i<l.length;i++)r(l[i]);var p=a;t()}([])</script><script src="/static/js/2.b7a6937f.chunk.js"></script><script src="/static/js/main.07373ac9.chunk.js"></script></body></html>
|
||||
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="shortcut icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"/><meta name="theme-color" content="#000000"/><link rel="manifest" href="/manifest.json"/><title>Squeak Node</title><meta name="description" content="Squeak Node is a frontend for accessing a squeak node"><meta name="keywords" content="squeak, bitcoin, lightning"><meta name="author" content="Flatlogic LLC."><link href="/static/css/2.68adb498.chunk.css" rel="stylesheet"></head><body style="font-family:Roboto,sans-serif"><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>!function(e){function r(r){for(var n,f,l=r[0],a=r[1],i=r[2],c=0,s=[];c<l.length;c++)f=l[c],Object.prototype.hasOwnProperty.call(o,f)&&o[f]&&s.push(o[f][0]),o[f]=0;for(n in a)Object.prototype.hasOwnProperty.call(a,n)&&(e[n]=a[n]);for(p&&p(r);s.length;)s.shift()();return u.push.apply(u,i||[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,l=1;l<t.length;l++){var a=t[l];0!==o[a]&&(n=!1)}n&&(u.splice(r--,1),e=f(f.s=t[0]))}return e}var n={},o={1:0},u=[];function f(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,f),t.l=!0,t.exports}f.m=e,f.c=n,f.d=function(e,r,t){f.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},f.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},f.t=function(e,r){if(1&r&&(e=f(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(f.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)f.d(t,n,function(r){return e[r]}.bind(null,n));return t},f.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(r,"a",r),r},f.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},f.p="/";var l=this["webpackJsonpsqueak-node-frontend"]=this["webpackJsonpsqueak-node-frontend"]||[],a=l.push.bind(l);l.push=r,l=l.slice();for(var i=0;i<l.length;i++)r(l[i]);var p=a;t()}([])</script><script src="/static/js/2.b7a6937f.chunk.js"></script><script src="/static/js/main.2c8f8b20.chunk.js"></script></body></html>
|
||||
|
|
@ -0,0 +1,54 @@
|
|||
self.__precacheManifest = (self.__precacheManifest || []).concat([
|
||||
{
|
||||
"revision": "41f9be84c9136540d3ec6572b73ff0a7",
|
||||
"url": "/index.html"
|
||||
},
|
||||
{
|
||||
"revision": "2dced8746abc61b13760",
|
||||
"url": "/static/css/2.68adb498.chunk.css"
|
||||
},
|
||||
{
|
||||
"revision": "2dced8746abc61b13760",
|
||||
"url": "/static/js/2.b7a6937f.chunk.js"
|
||||
},
|
||||
{
|
||||
"revision": "d92829c3e9f72dcd719b3bd85bf36851",
|
||||
"url": "/static/js/2.b7a6937f.chunk.js.LICENSE.txt"
|
||||
},
|
||||
{
|
||||
"revision": "e0bb234fce4371e1e4f6",
|
||||
"url": "/static/js/main.2c8f8b20.chunk.js"
|
||||
},
|
||||
{
|
||||
"revision": "cc9816de5a8639d377ea",
|
||||
"url": "/static/js/runtime-main.9f0ba400.js"
|
||||
},
|
||||
{
|
||||
"revision": "674f50d287a8c48dc19ba404d20fe713",
|
||||
"url": "/static/media/fontawesome-webfont.674f50d2.eot"
|
||||
},
|
||||
{
|
||||
"revision": "912ec66d7572ff821749319396470bde",
|
||||
"url": "/static/media/fontawesome-webfont.912ec66d.svg"
|
||||
},
|
||||
{
|
||||
"revision": "af7ae505a9eed503f8b8e6982036873e",
|
||||
"url": "/static/media/fontawesome-webfont.af7ae505.woff2"
|
||||
},
|
||||
{
|
||||
"revision": "b06871f281fee6b241d60582ae9369b9",
|
||||
"url": "/static/media/fontawesome-webfont.b06871f2.ttf"
|
||||
},
|
||||
{
|
||||
"revision": "fee66e712a8a08eef5805a46892932ad",
|
||||
"url": "/static/media/fontawesome-webfont.fee66e71.woff"
|
||||
},
|
||||
{
|
||||
"revision": "695a31606b1abb167b03fb1f6375831d",
|
||||
"url": "/static/media/google.695a3160.svg"
|
||||
},
|
||||
{
|
||||
"revision": "a0185b043dee68a72aebffdcc939e21e",
|
||||
"url": "/static/media/logo.a0185b04.svg"
|
||||
}
|
||||
]);
|
||||
|
|
@ -14,7 +14,7 @@
|
|||
importScripts("https://storage.googleapis.com/workbox-cdn/releases/4.3.1/workbox-sw.js");
|
||||
|
||||
importScripts(
|
||||
"/precache-manifest.4c6531577a1c1f3df10925078cd3f770.js"
|
||||
"/precache-manifest.d241ad5d86ba00b5c82406f4d9dc00ee.js"
|
||||
);
|
||||
|
||||
self.addEventListener('message', (event) => {
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Loading…
Add table
Add a link
Reference in a new issue