Fixes after merging upstream

Author: gruve-p

electrum-grs.desktop

@@ -17,6 +17,7 @@ Terminal=false
 Type=Application
 MimeType=x-scheme-handler/groestlcoin;x-scheme-handler/lightning;
 Actions=Testnet;
+Keywords=crypto;currency;GRS
 
 [Desktop Action Testnet]
 Exec=electrum-grs --testnet %u

electrum_grs/plugins/cosigner_pool/__init__.py

@@ -1,10 +1,5 @@
-<<<<<<<< HEAD:electrum_grs/plugins/cosigner_pool/__init__.py
 from electrum_grs.i18n import _
-fullname = _('Cosigner Pool')
-========
-from electrum.i18n import _
 fullname = _('PSBT over Nostr')
->>>>>>>> upstream/master:electrum/plugins/psbt_nostr/__init__.py
 description = ' '.join([
     _("This plugin facilitates the use of multi-signatures wallets."),
     _("It sends and receives partially signed transactions from/to your cosigner wallet."),

electrum/plugins/psbt_nostr/__init__.py electrum_grs/plugins/psbt_nostr/__init__.py

@@ -35,23 +35,23 @@
 import electrum_aionostr as aionostr
 from electrum_aionostr.key import PrivateKey
 
-from electrum.crypto import sha256
-from electrum import util
-from electrum.transaction import Transaction, PartialTransaction, tx_from_any, SerializationError
-from electrum.bip32 import BIP32Node
-from electrum.plugin import BasePlugin, hook
-from electrum.i18n import _
-from electrum.wallet import Multisig_Wallet, Abstract_Wallet
-from electrum.logging import Logger
-from electrum.network import Network
-from electrum.util import log_exceptions, OldTaskGroup, UserCancelled
-
-from electrum.gui.qt.transaction_dialog import show_transaction, TxDialog
-from electrum.gui.qt.util import WaitingDialog
+from electrum_grs.crypto import sha256
+from electrum_grs import util
+from electrum_grs.transaction import Transaction, PartialTransaction, tx_from_any, SerializationError
+from electrum_grs.bip32 import BIP32Node
+from electrum_grs.plugin import BasePlugin, hook
+from electrum_grs.i18n import _
+from electrum_grs.wallet import Multisig_Wallet, Abstract_Wallet
+from electrum_grs.logging import Logger
+from electrum_grs.network import Network
+from electrum_grs.util import log_exceptions, OldTaskGroup, UserCancelled
+
+from electrum_grs.gui.qt.transaction_dialog import show_transaction, TxDialog
+from electrum_grs.gui.qt.util import WaitingDialog
 
 if TYPE_CHECKING:
-    from electrum.gui.qt import ElectrumGui
-    from electrum.gui.qt.main_window import ElectrumWindow
+    from electrum_grs.gui.qt import ElectrumGui
+    from electrum_grs.gui.qt.main_window import ElectrumWindow
 
 
 NOSTR_DM = 4

electrum/plugins/psbt_nostr/qt.py electrum_grs/plugins/psbt_nostr/qt.py

@@ -326,7 +326,7 @@ def main():
             'cmd': 'gui',
             SimpleConfig.GUI_NAME.key(): 'qml',
             SimpleConfig.WALLET_USE_SINGLE_PASSWORD.key(): True,
-            SimpleConfig.SWAPSERVER_URL: 'https://swaps.electrum.org/api',
+            SimpleConfig.SWAPSERVER_URL: 'https://swaps.groestlcoin.org/api',
         }
         if util.get_android_package_name() == "org.groestlcoin.testnet.electrumgrs":
             # ~hack for easier testnet builds. pkgname subject to change.