diff --git a/apps/apps_service.go b/apps/apps_service.go index 1adcddd9..c0bbda7c 100644 --- a/apps/apps_service.go +++ b/apps/apps_service.go @@ -9,13 +9,13 @@ import ( "strings" "time" + "github.com/getAlby/go-nostr" "github.com/getAlby/hub/config" "github.com/getAlby/hub/constants" "github.com/getAlby/hub/db" "github.com/getAlby/hub/events" "github.com/getAlby/hub/logger" "github.com/getAlby/hub/service/keys" - "github.com/nbd-wtf/go-nostr" "gorm.io/datatypes" "gorm.io/gorm" ) diff --git a/go.mod b/go.mod index c09aa99a..9a334c85 100644 --- a/go.mod +++ b/go.mod @@ -7,12 +7,12 @@ require ( github.com/btcsuite/btcd v0.24.3-0.20250318170759-4f4ea81776d6 github.com/btcsuite/btcd/btcutil v1.1.6 github.com/elnosh/gonuts v0.4.2 + github.com/getAlby/go-nostr v0.0.0-20260509070347-31e205cac904 github.com/getAlby/ldk-node-go v0.0.0-20260424111754-3690cdb3031c github.com/go-gormigrate/gormigrate/v2 v2.1.5 github.com/google/uuid v1.6.0 github.com/labstack/echo/v4 v4.15.1 github.com/mattn/go-sqlite3 v1.14.44 - github.com/nbd-wtf/go-nostr v0.52.3 github.com/nbd-wtf/ln-decodepay v1.13.0 github.com/orandin/lumberjackrus v1.0.1 github.com/peterldowns/pgtestdb v0.1.1 diff --git a/go.sum b/go.sum index 6fc1139c..e754794d 100644 --- a/go.sum +++ b/go.sum @@ -189,6 +189,8 @@ github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0= github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E= github.com/fxamacker/cbor/v2 v2.7.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ= +github.com/getAlby/go-nostr v0.0.0-20260509070347-31e205cac904 h1:UvdEf2rj3EXGR/HkMz3eZI9x1hBdSSlTLutyIHLYy8o= +github.com/getAlby/go-nostr v0.0.0-20260509070347-31e205cac904/go.mod h1:BtlkV9evCTjpY0YeFhoNgycp7XNFbnfVXJPoykp+NtM= github.com/getAlby/ldk-node-go v0.0.0-20260424111754-3690cdb3031c h1:ikai5+taiPSgbaocdVMdxPkmOhnXs5V/gCX+J/P8iRw= github.com/getAlby/ldk-node-go v0.0.0-20260424111754-3690cdb3031c/go.mod h1:8BRjtKcz8E0RyYTPEbMS8VIdgredcGSLne8vHDtcRLg= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= @@ -510,8 +512,6 @@ github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= -github.com/nbd-wtf/go-nostr v0.52.3 h1:Xd87pXfJEJRXHpM+fLjQQln8dBNNaoPA10V7BbyP4KI= -github.com/nbd-wtf/go-nostr v0.52.3/go.mod h1:4avYoc9mDGZ9wHsvCOhHH9vPzKucCfuYBtJUSpHTfNk= github.com/nbd-wtf/ln-decodepay v1.13.0 h1:ic32UwT6cBVbLw72fQ7vr0nTMziYTj67baQ2COwlxZk= github.com/nbd-wtf/ln-decodepay v1.13.0/go.mod h1:SNcdOd7Mv7+PY6Q5E/flUAOfnFdr/W/PK2O6wyzpra8= github.com/ncruces/go-strftime v0.1.9 h1:bY0MQC28UADQmHmaF5dgpLmImcShSi2kHU9XLdhx/f4= diff --git a/nip47/cipher/cipher.go b/nip47/cipher/cipher.go index 8933048a..4a0ff57b 100644 --- a/nip47/cipher/cipher.go +++ b/nip47/cipher/cipher.go @@ -3,9 +3,9 @@ package cipher import ( "fmt" + "github.com/getAlby/go-nostr/nip04" + "github.com/getAlby/go-nostr/nip44" "github.com/getAlby/hub/constants" - "github.com/nbd-wtf/go-nostr/nip04" - "github.com/nbd-wtf/go-nostr/nip44" ) const ( diff --git a/nip47/cipher/cipher_test.go b/nip47/cipher/cipher_test.go index 83212e87..978443c9 100644 --- a/nip47/cipher/cipher_test.go +++ b/nip47/cipher/cipher_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" + "github.com/getAlby/go-nostr" "github.com/getAlby/hub/constants" - "github.com/nbd-wtf/go-nostr" "github.com/stretchr/testify/assert" ) diff --git a/nip47/controllers/cancel_hold_invoice_controller.go b/nip47/controllers/cancel_hold_invoice_controller.go index e583bc64..ca658e51 100644 --- a/nip47/controllers/cancel_hold_invoice_controller.go +++ b/nip47/controllers/cancel_hold_invoice_controller.go @@ -3,9 +3,9 @@ package controllers import ( "context" + "github.com/getAlby/go-nostr" "github.com/getAlby/hub/logger" "github.com/getAlby/hub/nip47/models" - "github.com/nbd-wtf/go-nostr" "github.com/sirupsen/logrus" ) diff --git a/nip47/controllers/cancel_hold_invoice_controller_test.go b/nip47/controllers/cancel_hold_invoice_controller_test.go index 8eb4d907..a1a70ee7 100644 --- a/nip47/controllers/cancel_hold_invoice_controller_test.go +++ b/nip47/controllers/cancel_hold_invoice_controller_test.go @@ -5,7 +5,7 @@ import ( "encoding/json" "testing" - "github.com/nbd-wtf/go-nostr" + "github.com/getAlby/go-nostr" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/nip47/controllers/create_connection_controller.go b/nip47/controllers/create_connection_controller.go index 6bca43ce..45f46f4b 100644 --- a/nip47/controllers/create_connection_controller.go +++ b/nip47/controllers/create_connection_controller.go @@ -5,12 +5,12 @@ import ( "slices" "time" + "github.com/getAlby/go-nostr" "github.com/getAlby/hub/alby" "github.com/getAlby/hub/constants" "github.com/getAlby/hub/logger" "github.com/getAlby/hub/nip47/models" "github.com/getAlby/hub/nip47/permissions" - "github.com/nbd-wtf/go-nostr" "github.com/sirupsen/logrus" ) diff --git a/nip47/controllers/create_connection_controller_test.go b/nip47/controllers/create_connection_controller_test.go index 612979b5..c43bdafb 100644 --- a/nip47/controllers/create_connection_controller_test.go +++ b/nip47/controllers/create_connection_controller_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/nbd-wtf/go-nostr" + "github.com/getAlby/go-nostr" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/nip47/controllers/get_balance_controller.go b/nip47/controllers/get_balance_controller.go index 6ea93b2b..a4d87e66 100644 --- a/nip47/controllers/get_balance_controller.go +++ b/nip47/controllers/get_balance_controller.go @@ -3,11 +3,11 @@ package controllers import ( "context" + "github.com/getAlby/go-nostr" "github.com/getAlby/hub/db" "github.com/getAlby/hub/db/queries" "github.com/getAlby/hub/logger" "github.com/getAlby/hub/nip47/models" - "github.com/nbd-wtf/go-nostr" "github.com/sirupsen/logrus" ) diff --git a/nip47/controllers/get_balance_controller_test.go b/nip47/controllers/get_balance_controller_test.go index 3daae84b..211142a3 100644 --- a/nip47/controllers/get_balance_controller_test.go +++ b/nip47/controllers/get_balance_controller_test.go @@ -5,7 +5,7 @@ import ( "encoding/json" "testing" - "github.com/nbd-wtf/go-nostr" + "github.com/getAlby/go-nostr" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/nip47/controllers/get_budget_controller.go b/nip47/controllers/get_budget_controller.go index 16530ffb..ccf0c4d3 100644 --- a/nip47/controllers/get_budget_controller.go +++ b/nip47/controllers/get_budget_controller.go @@ -3,8 +3,8 @@ package controllers import ( "context" + "github.com/getAlby/go-nostr" "github.com/getAlby/hub/db/queries" - "github.com/nbd-wtf/go-nostr" "github.com/getAlby/hub/db" "github.com/getAlby/hub/logger" diff --git a/nip47/controllers/get_budget_controller_test.go b/nip47/controllers/get_budget_controller_test.go index 31cb326c..b39b7194 100644 --- a/nip47/controllers/get_budget_controller_test.go +++ b/nip47/controllers/get_budget_controller_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/nbd-wtf/go-nostr" + "github.com/getAlby/go-nostr" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/nip47/controllers/get_info_controller.go b/nip47/controllers/get_info_controller.go index e81c7242..c6667c55 100644 --- a/nip47/controllers/get_info_controller.go +++ b/nip47/controllers/get_info_controller.go @@ -4,11 +4,11 @@ import ( "context" "encoding/json" + "github.com/getAlby/go-nostr" "github.com/getAlby/hub/constants" "github.com/getAlby/hub/db" "github.com/getAlby/hub/logger" "github.com/getAlby/hub/nip47/models" - "github.com/nbd-wtf/go-nostr" "github.com/sirupsen/logrus" ) diff --git a/nip47/controllers/get_info_controller_test.go b/nip47/controllers/get_info_controller_test.go index 1dc169d0..57ee4788 100644 --- a/nip47/controllers/get_info_controller_test.go +++ b/nip47/controllers/get_info_controller_test.go @@ -5,7 +5,7 @@ import ( "encoding/json" "testing" - "github.com/nbd-wtf/go-nostr" + "github.com/getAlby/go-nostr" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/nip47/controllers/list_transactions_controller.go b/nip47/controllers/list_transactions_controller.go index 4aed4309..450a55ea 100644 --- a/nip47/controllers/list_transactions_controller.go +++ b/nip47/controllers/list_transactions_controller.go @@ -3,9 +3,9 @@ package controllers import ( "context" + "github.com/getAlby/go-nostr" "github.com/getAlby/hub/logger" "github.com/getAlby/hub/nip47/models" - "github.com/nbd-wtf/go-nostr" "github.com/sirupsen/logrus" ) diff --git a/nip47/controllers/list_transactions_controller_test.go b/nip47/controllers/list_transactions_controller_test.go index 5adf2053..8520c539 100644 --- a/nip47/controllers/list_transactions_controller_test.go +++ b/nip47/controllers/list_transactions_controller_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/nbd-wtf/go-nostr" + "github.com/getAlby/go-nostr" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/nip47/controllers/lookup_invoice_controller.go b/nip47/controllers/lookup_invoice_controller.go index ba3bc5fb..91c2c24e 100644 --- a/nip47/controllers/lookup_invoice_controller.go +++ b/nip47/controllers/lookup_invoice_controller.go @@ -5,10 +5,10 @@ import ( "fmt" "strings" + "github.com/getAlby/go-nostr" "github.com/getAlby/hub/constants" "github.com/getAlby/hub/logger" "github.com/getAlby/hub/nip47/models" - "github.com/nbd-wtf/go-nostr" decodepay "github.com/nbd-wtf/ln-decodepay" "github.com/sirupsen/logrus" ) diff --git a/nip47/controllers/lookup_invoice_controller_test.go b/nip47/controllers/lookup_invoice_controller_test.go index 92b5b40a..08cff6d9 100644 --- a/nip47/controllers/lookup_invoice_controller_test.go +++ b/nip47/controllers/lookup_invoice_controller_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/nbd-wtf/go-nostr" + "github.com/getAlby/go-nostr" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/nip47/controllers/make_hold_invoice_controller.go b/nip47/controllers/make_hold_invoice_controller.go index 01493e6b..93ed5255 100644 --- a/nip47/controllers/make_hold_invoice_controller.go +++ b/nip47/controllers/make_hold_invoice_controller.go @@ -3,10 +3,10 @@ package controllers import ( "context" + "github.com/getAlby/go-nostr" "github.com/getAlby/hub/constants" "github.com/getAlby/hub/logger" "github.com/getAlby/hub/nip47/models" - "github.com/nbd-wtf/go-nostr" "github.com/sirupsen/logrus" ) diff --git a/nip47/controllers/make_hold_invoice_controller_test.go b/nip47/controllers/make_hold_invoice_controller_test.go index bac492d3..85cb12de 100644 --- a/nip47/controllers/make_hold_invoice_controller_test.go +++ b/nip47/controllers/make_hold_invoice_controller_test.go @@ -5,7 +5,7 @@ import ( "encoding/json" "testing" - "github.com/nbd-wtf/go-nostr" + "github.com/getAlby/go-nostr" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/nip47/controllers/make_invoice_controller.go b/nip47/controllers/make_invoice_controller.go index a847873b..94339c93 100644 --- a/nip47/controllers/make_invoice_controller.go +++ b/nip47/controllers/make_invoice_controller.go @@ -3,9 +3,9 @@ package controllers import ( "context" + "github.com/getAlby/go-nostr" "github.com/getAlby/hub/logger" "github.com/getAlby/hub/nip47/models" - "github.com/nbd-wtf/go-nostr" "github.com/sirupsen/logrus" ) diff --git a/nip47/controllers/make_invoice_controller_test.go b/nip47/controllers/make_invoice_controller_test.go index 9be1bd2d..6a0c10f0 100644 --- a/nip47/controllers/make_invoice_controller_test.go +++ b/nip47/controllers/make_invoice_controller_test.go @@ -5,7 +5,7 @@ import ( "encoding/json" "testing" - "github.com/nbd-wtf/go-nostr" + "github.com/getAlby/go-nostr" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/nip47/controllers/models.go b/nip47/controllers/models.go index f5e838bd..34cace71 100644 --- a/nip47/controllers/models.go +++ b/nip47/controllers/models.go @@ -1,8 +1,8 @@ package controllers import ( + "github.com/getAlby/go-nostr" "github.com/getAlby/hub/nip47/models" - "github.com/nbd-wtf/go-nostr" ) type publishFunc = func(*models.Response, nostr.Tags) diff --git a/nip47/controllers/multi_pay_invoice_controller.go b/nip47/controllers/multi_pay_invoice_controller.go index e40f095d..d9e57b03 100644 --- a/nip47/controllers/multi_pay_invoice_controller.go +++ b/nip47/controllers/multi_pay_invoice_controller.go @@ -6,11 +6,11 @@ import ( "strings" "sync" + "github.com/getAlby/go-nostr" "github.com/getAlby/hub/constants" "github.com/getAlby/hub/db" "github.com/getAlby/hub/logger" "github.com/getAlby/hub/nip47/models" - "github.com/nbd-wtf/go-nostr" decodepay "github.com/nbd-wtf/ln-decodepay" "github.com/sirupsen/logrus" ) diff --git a/nip47/controllers/multi_pay_invoice_controller_test.go b/nip47/controllers/multi_pay_invoice_controller_test.go index 3d068f8c..7942dba5 100644 --- a/nip47/controllers/multi_pay_invoice_controller_test.go +++ b/nip47/controllers/multi_pay_invoice_controller_test.go @@ -8,7 +8,7 @@ import ( "sync" "testing" - "github.com/nbd-wtf/go-nostr" + "github.com/getAlby/go-nostr" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/nip47/controllers/multi_pay_keysend_controller.go b/nip47/controllers/multi_pay_keysend_controller.go index 6c91eca6..c774af92 100644 --- a/nip47/controllers/multi_pay_keysend_controller.go +++ b/nip47/controllers/multi_pay_keysend_controller.go @@ -4,9 +4,9 @@ import ( "context" "sync" + "github.com/getAlby/go-nostr" "github.com/getAlby/hub/db" "github.com/getAlby/hub/nip47/models" - "github.com/nbd-wtf/go-nostr" ) type multiPayKeysendParams struct { diff --git a/nip47/controllers/multi_pay_keysend_controller_test.go b/nip47/controllers/multi_pay_keysend_controller_test.go index 16a9702f..700c476e 100644 --- a/nip47/controllers/multi_pay_keysend_controller_test.go +++ b/nip47/controllers/multi_pay_keysend_controller_test.go @@ -7,7 +7,7 @@ import ( "sync" "testing" - "github.com/nbd-wtf/go-nostr" + "github.com/getAlby/go-nostr" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/nip47/controllers/pay_invoice_controller.go b/nip47/controllers/pay_invoice_controller.go index ed4e8e66..c1e656ec 100644 --- a/nip47/controllers/pay_invoice_controller.go +++ b/nip47/controllers/pay_invoice_controller.go @@ -5,11 +5,11 @@ import ( "fmt" "strings" + "github.com/getAlby/go-nostr" "github.com/getAlby/hub/constants" "github.com/getAlby/hub/db" "github.com/getAlby/hub/logger" "github.com/getAlby/hub/nip47/models" - "github.com/nbd-wtf/go-nostr" decodepay "github.com/nbd-wtf/ln-decodepay" "github.com/sirupsen/logrus" ) diff --git a/nip47/controllers/pay_invoice_controller_test.go b/nip47/controllers/pay_invoice_controller_test.go index b0f7a6ca..7284f064 100644 --- a/nip47/controllers/pay_invoice_controller_test.go +++ b/nip47/controllers/pay_invoice_controller_test.go @@ -5,7 +5,7 @@ import ( "encoding/json" "testing" - "github.com/nbd-wtf/go-nostr" + "github.com/getAlby/go-nostr" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/nip47/controllers/pay_keysend_controller.go b/nip47/controllers/pay_keysend_controller.go index 960b365f..d75b7b1b 100644 --- a/nip47/controllers/pay_keysend_controller.go +++ b/nip47/controllers/pay_keysend_controller.go @@ -3,11 +3,11 @@ package controllers import ( "context" + "github.com/getAlby/go-nostr" "github.com/getAlby/hub/db" "github.com/getAlby/hub/lnclient" "github.com/getAlby/hub/logger" "github.com/getAlby/hub/nip47/models" - "github.com/nbd-wtf/go-nostr" "github.com/sirupsen/logrus" ) diff --git a/nip47/controllers/pay_keysend_controller_test.go b/nip47/controllers/pay_keysend_controller_test.go index 436fa2a1..1678903a 100644 --- a/nip47/controllers/pay_keysend_controller_test.go +++ b/nip47/controllers/pay_keysend_controller_test.go @@ -5,7 +5,7 @@ import ( "encoding/json" "testing" - "github.com/nbd-wtf/go-nostr" + "github.com/getAlby/go-nostr" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/nip47/controllers/settle_hold_invoice_controller.go b/nip47/controllers/settle_hold_invoice_controller.go index f24758e5..017fba5e 100644 --- a/nip47/controllers/settle_hold_invoice_controller.go +++ b/nip47/controllers/settle_hold_invoice_controller.go @@ -3,9 +3,9 @@ package controllers import ( "context" + "github.com/getAlby/go-nostr" "github.com/getAlby/hub/logger" "github.com/getAlby/hub/nip47/models" - "github.com/nbd-wtf/go-nostr" "github.com/sirupsen/logrus" ) diff --git a/nip47/controllers/settle_hold_invoice_controller_test.go b/nip47/controllers/settle_hold_invoice_controller_test.go index 5a5e1950..28599804 100644 --- a/nip47/controllers/settle_hold_invoice_controller_test.go +++ b/nip47/controllers/settle_hold_invoice_controller_test.go @@ -5,7 +5,7 @@ import ( "encoding/json" "testing" - "github.com/nbd-wtf/go-nostr" + "github.com/getAlby/go-nostr" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/nip47/controllers/sign_message_controller.go b/nip47/controllers/sign_message_controller.go index cffe91fd..a3e20d2a 100644 --- a/nip47/controllers/sign_message_controller.go +++ b/nip47/controllers/sign_message_controller.go @@ -3,9 +3,9 @@ package controllers import ( "context" + "github.com/getAlby/go-nostr" "github.com/getAlby/hub/logger" "github.com/getAlby/hub/nip47/models" - "github.com/nbd-wtf/go-nostr" "github.com/sirupsen/logrus" ) diff --git a/nip47/event_handler.go b/nip47/event_handler.go index 948bc6f2..365133f4 100644 --- a/nip47/event_handler.go +++ b/nip47/event_handler.go @@ -8,6 +8,7 @@ import ( "slices" "time" + "github.com/getAlby/go-nostr" "github.com/getAlby/hub/constants" "github.com/getAlby/hub/db" "github.com/getAlby/hub/events" @@ -18,7 +19,6 @@ import ( "github.com/getAlby/hub/nip47/models" "github.com/getAlby/hub/nip47/permissions" nostrmodels "github.com/getAlby/hub/nostr/models" - "github.com/nbd-wtf/go-nostr" "github.com/sirupsen/logrus" "gorm.io/gorm" ) diff --git a/nip47/event_handler_test.go b/nip47/event_handler_test.go index 2f0ec828..5b9d3b5e 100644 --- a/nip47/event_handler_test.go +++ b/nip47/event_handler_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/nbd-wtf/go-nostr" + "github.com/getAlby/go-nostr" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/nip47/nip47_service.go b/nip47/nip47_service.go index d6b414e7..25c0b467 100644 --- a/nip47/nip47_service.go +++ b/nip47/nip47_service.go @@ -4,6 +4,7 @@ import ( "context" "time" + "github.com/getAlby/go-nostr" "github.com/getAlby/hub/alby" "github.com/getAlby/hub/apps" "github.com/getAlby/hub/config" @@ -16,7 +17,6 @@ import ( nostrmodels "github.com/getAlby/hub/nostr/models" "github.com/getAlby/hub/service/keys" "github.com/getAlby/hub/transactions" - "github.com/nbd-wtf/go-nostr" "github.com/sirupsen/logrus" "gorm.io/gorm" ) diff --git a/nip47/notifications/nip47_notifier.go b/nip47/notifications/nip47_notifier.go index cdecc40a..e6a5dab1 100644 --- a/nip47/notifications/nip47_notifier.go +++ b/nip47/notifications/nip47_notifier.go @@ -5,6 +5,7 @@ import ( "encoding/json" "errors" + "github.com/getAlby/go-nostr" "github.com/getAlby/hub/config" "github.com/getAlby/hub/constants" "github.com/getAlby/hub/db" @@ -15,7 +16,6 @@ import ( "github.com/getAlby/hub/nip47/permissions" nostrmodels "github.com/getAlby/hub/nostr/models" "github.com/getAlby/hub/service/keys" - "github.com/nbd-wtf/go-nostr" "github.com/sirupsen/logrus" "gorm.io/gorm" ) diff --git a/nip47/notifications/nip47_notifier_test.go b/nip47/notifications/nip47_notifier_test.go index 92fe89d7..122195ef 100644 --- a/nip47/notifications/nip47_notifier_test.go +++ b/nip47/notifications/nip47_notifier_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/nbd-wtf/go-nostr" + "github.com/getAlby/go-nostr" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/nip47/publish_nip47_info.go b/nip47/publish_nip47_info.go index 727f3a0f..eaf14998 100644 --- a/nip47/publish_nip47_info.go +++ b/nip47/publish_nip47_info.go @@ -6,13 +6,13 @@ import ( "strconv" "strings" + "github.com/getAlby/go-nostr" "github.com/getAlby/hub/db" "github.com/getAlby/hub/lnclient" "github.com/getAlby/hub/logger" "github.com/getAlby/hub/nip47/cipher" "github.com/getAlby/hub/nip47/models" nostrmodels "github.com/getAlby/hub/nostr/models" - "github.com/nbd-wtf/go-nostr" "github.com/sirupsen/logrus" ) diff --git a/nostr/models/models.go b/nostr/models/models.go index a796f58e..2b9f3f66 100644 --- a/nostr/models/models.go +++ b/nostr/models/models.go @@ -3,7 +3,7 @@ package models import ( "context" - "github.com/nbd-wtf/go-nostr" + "github.com/getAlby/go-nostr" ) type SimplePool interface { diff --git a/service/create_app_consumer.go b/service/create_app_consumer.go index 419fe44f..b38751de 100644 --- a/service/create_app_consumer.go +++ b/service/create_app_consumer.go @@ -3,7 +3,7 @@ package service import ( "context" - "github.com/nbd-wtf/go-nostr" + "github.com/getAlby/go-nostr" "github.com/sirupsen/logrus" "github.com/getAlby/hub/db" diff --git a/service/delete_app_consumer.go b/service/delete_app_consumer.go index 4d4abb8c..8bb55dd0 100644 --- a/service/delete_app_consumer.go +++ b/service/delete_app_consumer.go @@ -3,9 +3,9 @@ package service import ( "context" + "github.com/getAlby/go-nostr" "github.com/getAlby/hub/events" "github.com/getAlby/hub/logger" - "github.com/nbd-wtf/go-nostr" ) type deleteAppConsumer struct { diff --git a/service/keys/keys.go b/service/keys/keys.go index aeb35f9c..039efc1d 100644 --- a/service/keys/keys.go +++ b/service/keys/keys.go @@ -10,9 +10,9 @@ import ( "github.com/btcsuite/btcd/btcutil/hdkeychain" "github.com/btcsuite/btcd/chaincfg" + "github.com/getAlby/go-nostr" "github.com/getAlby/hub/config" "github.com/getAlby/hub/logger" - "github.com/nbd-wtf/go-nostr" "github.com/tyler-smith/go-bip32" "github.com/tyler-smith/go-bip39" ) diff --git a/service/keys/keys_test.go b/service/keys/keys_test.go index a61779a9..9e8a5131 100644 --- a/service/keys/keys_test.go +++ b/service/keys/keys_test.go @@ -11,7 +11,7 @@ import ( "github.com/getAlby/hub/logger" "github.com/getAlby/hub/tests/db" - "github.com/nbd-wtf/go-nostr" + "github.com/getAlby/go-nostr" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/tyler-smith/go-bip32" diff --git a/service/start.go b/service/start.go index 916b8f3a..a90c08cb 100644 --- a/service/start.go +++ b/service/start.go @@ -14,8 +14,8 @@ import ( "github.com/getAlby/hub/swaps" "github.com/getAlby/hub/version" - "github.com/nbd-wtf/go-nostr" - "github.com/nbd-wtf/go-nostr/nip19" + "github.com/getAlby/go-nostr" + "github.com/getAlby/go-nostr/nip19" "github.com/sirupsen/logrus" "github.com/getAlby/hub/config" diff --git a/service/update_app_consumer.go b/service/update_app_consumer.go index b908a05a..15229a14 100644 --- a/service/update_app_consumer.go +++ b/service/update_app_consumer.go @@ -3,9 +3,9 @@ package service import ( "context" + "github.com/getAlby/go-nostr" "github.com/getAlby/hub/events" "github.com/getAlby/hub/logger" - "github.com/nbd-wtf/go-nostr" ) type updateAppConsumer struct { diff --git a/tests/create_app.go b/tests/create_app.go index 7a7b0995..0f0e8e26 100644 --- a/tests/create_app.go +++ b/tests/create_app.go @@ -3,11 +3,11 @@ package tests import ( "time" + "github.com/getAlby/go-nostr" "github.com/getAlby/hub/constants" db "github.com/getAlby/hub/db" "github.com/getAlby/hub/events" "github.com/getAlby/hub/nip47/cipher" - "github.com/nbd-wtf/go-nostr" "gorm.io/gorm" ) diff --git a/tests/create_mock_relay.go b/tests/create_mock_relay.go index bda74729..3246fde6 100644 --- a/tests/create_mock_relay.go +++ b/tests/create_mock_relay.go @@ -3,8 +3,8 @@ package tests import ( "context" + "github.com/getAlby/go-nostr" "github.com/getAlby/hub/logger" - "github.com/nbd-wtf/go-nostr" ) type mockSimplePool struct {