Advanced maker options v1

.env-sample

@@ -55,8 +55,10 @@ FEE = 0.002
 # Shall incentivize order making
 MAKER_FEE_SPLIT=0.125
 
-# Default bond size as fraction
-BOND_SIZE = 0.01
+# Bond size as percentage (%)
+DEFAULT_BOND_SIZE = 1
+MIN_BOND_SIZE = 1
+MAX_BOND_SIZE = 15
 
 # Time out penalty for canceling takers in SECONDS
 PENALTY_TIMEOUT = 60
@@ -69,6 +71,7 @@ MAX_PUBLIC_ORDERS = 100
 # Trade limits in satoshis
 MIN_TRADE = 20000 
 MAX_TRADE = 800000
+MAX_TRADE_BONDLESS_TAKER = 50000
 
 # Expiration (CLTV_expiry) time for HODL invoices in HOURS // 7 min/block assumed
 BOND_EXPIRY = 54
@@ -79,7 +82,10 @@ EXP_MAKER_BOND_INVOICE = 300
 EXP_TAKER_BOND_INVOICE = 200
 
 # Time a order is public in the book HOURS
-PUBLIC_ORDER_DURATION = 6
+DEFAULT_PUBLIC_ORDER_DURATION = 24
+MAX_PUBLIC_ORDER_DURATION = 24
+MIN_PUBLIC_ORDER_DURATION = 0.166
+
 # Time to provide a valid invoice and the trade escrow MINUTES
 INVOICE_AND_ESCROW_DURATION = 30
 # Time to confim chat and confirm fiat (time to Fiat Sent confirmation) HOURS

.gitignore

@@ -651,4 +651,5 @@ api/lightning/invoices*
 api/lightning/router*
 api/lightning/googleapis*
 frontend/static/admin*
-frontend/static/rest_framework*
+frontend/static/rest_framework*
+frontend/static/import_export*

api/admin.py

@@ -13,21 +13,25 @@ class ProfileInline(admin.StackedInline):
     can_delete = False
     fields = ("avatar_tag", )
     readonly_fields = ["avatar_tag"]
-
+    show_change_link = True
 
 # extended users with avatars
 @admin.register(User)
-class EUserAdmin(UserAdmin):
+class EUserAdmin(AdminChangeLinksMixin, UserAdmin):
     inlines = [ProfileInline]
     list_display = (
         "avatar_tag",
         "id",
+        "profile_link",
         "username",
         "last_login",
         "date_joined",
         "is_staff",
     )
     list_display_links = ("id", "username")
+    change_links = (
+        "profile",
+    )
     ordering = ("-id", )
 
     def avatar_tag(self, obj):
@@ -42,7 +46,7 @@ class OrderAdmin(AdminChangeLinksMixin, admin.ModelAdmin):
         "maker_link",
         "taker_link",
         "status",
-        "amount",
+        "amt",
         "currency_link",
         "t0_satoshis",
         "is_disputed",
@@ -65,7 +69,13 @@ class OrderAdmin(AdminChangeLinksMixin, admin.ModelAdmin):
         "trade_escrow",
     )
     list_filter = ("is_disputed", "is_fiat_sent", "type", "currency", "status")
-    search_fields = ["id","amount"]
+    search_fields = ["id","amount","min_amount","max_amount"]
+
+    def amt(self, obj):
+        if obj.has_range and obj.amount == None:
+            return str(float(obj.min_amount))+"-"+ str(float(obj.max_amount))
+        else:
+           return float(obj.amount)
 
 @admin.register(LNPayment)
 class LNPaymentAdmin(AdminChangeLinksMixin, admin.ModelAdmin):
@@ -74,6 +84,7 @@ class LNPaymentAdmin(AdminChangeLinksMixin, admin.ModelAdmin):
         "concept",
         "status",
         "num_satoshis",
+        "fee",
         "type",
         "expires_at",
         "expiry_height",
@@ -95,7 +106,7 @@ class LNPaymentAdmin(AdminChangeLinksMixin, admin.ModelAdmin):
     )
     list_filter = ("type", "concept", "status")
     ordering = ("-expires_at", )
-    search_fields = ["payment_hash","num_satoshis"]
+    search_fields = ["payment_hash","num_satoshis","sender__username","receiver__username","description"]
 
 
 @admin.register(Profile)
@@ -116,9 +127,11 @@ class UserProfileAdmin(AdminChangeLinksMixin, admin.ModelAdmin):
         "num_disputes",
         "lost_disputes",
     )
+    list_editable = ["pending_rewards", "earned_rewards"]
     list_display_links = ("avatar_tag", "id")
     change_links = ["user"]
     readonly_fields = ["avatar_tag"]
+    search_fields = ["user__username","id"]
 
 
 @admin.register(Currency)
@@ -128,7 +141,6 @@ class CurrencieAdmin(admin.ModelAdmin):
     readonly_fields = ("currency", "exchange_rate", "timestamp")
     ordering = ("id", )
 
-
 @admin.register(MarketTick)
 class MarketTickAdmin(admin.ModelAdmin):
     list_display = ("timestamp", "price", "volume", "premium", "currency",

api/lightning/node.py

@@ -261,6 +261,7 @@ def pay_invoice(cls, lnpayment):
 
             if response.status == 2:  # STATUS 'SUCCEEDED'
                 lnpayment.status = LNPayment.Status.SUCCED
+                lnpayment.fee = float(response.fee_msat)/1000
                 lnpayment.save()
                 return True, None