Merge branch 'OWO-develop' of https://github.com/decenomy/DSW

decenomy · Sep 30, 2021 · 7d0b48b · 7d0b48b
2 parents c19e1f1 + a10948f
commit 7d0b48b
Show file tree

Hide file tree

Showing 16 changed files with 34 additions and 34 deletions.
diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@
 • Prefix: OWO adresses start with the lower case letter "o"  
 • Ports: 32112 (p2p) / 32113 (rpc)  
 • Explorer https://explorer.decenomy.net/OWO/blocks  
-• Website [https://oneworldcoin.io/](https://oneworldcoin.io/)    
+• Website [https://owocoin.net/](https://owocoin.net/)    
 
 ## Rewards Breakdown
 |Block  |Collateral|Block Reward|MN Reward %|Staking Reward %|Dev Fee %|MN Reward|Staker Reward|Dev Fee|roi 500|roi 1000|roi 1500|roi 2000|roi 2500|coin supply |

diff --git a/configure.ac b/configure.ac
@@ -3,11 +3,11 @@ AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 4)
 define(_CLIENT_VERSION_MINOR, 0)
 define(_CLIENT_VERSION_REVISION, 0)
-define(_CLIENT_VERSION_BUILD, 0)
+define(_CLIENT_VERSION_BUILD, 1)
 define(_CLIENT_VERSION_RC, 0)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2020)
-AC_INIT([OneWorld Core],m4_join([.], _CLIENT_VERSION_MAJOR, _CLIENT_VERSION_MINOR, _CLIENT_VERSION_REVISION, m4_if(_CLIENT_VERSION_BUILD, [0], [], _CLIENT_VERSION_BUILD))m4_if(_CLIENT_VERSION_RC, [0], [], [rc]_CLIENT_VERSION_RC),[https://github.com/decenomy/OWO/issues],[oneworld],[https://oneworldcoin.io/])
+AC_INIT([OneWorld Core],m4_join([.], _CLIENT_VERSION_MAJOR, _CLIENT_VERSION_MINOR, _CLIENT_VERSION_REVISION, m4_if(_CLIENT_VERSION_BUILD, [0], [], _CLIENT_VERSION_BUILD))m4_if(_CLIENT_VERSION_RC, [0], [], [rc]_CLIENT_VERSION_RC),[https://github.com/decenomy/OWO/issues],[oneworld],[https://owocoin.net/])
 AC_CONFIG_SRCDIR([src/main.cpp])
 AC_CONFIG_HEADERS([src/config/pivx-config.h])
 AC_CONFIG_AUX_DIR([build-aux])

diff --git a/contrib/debian/control b/contrib/debian/control
@@ -28,7 +28,7 @@ Build-Depends: debhelper,
  libzmq3-dev,
  dh-systemd
 Standards-Version: 3.9.2
-Homepage: http://oneworldcoin.io/
+Homepage: http://owocoin.net/
 Vcs-Git: git://https://github.com/decenomy/OWO.git
 Vcs-Browser: https://https://github.com/decenomy/OWO
 

diff --git a/contrib/innosetup/setup.iss b/contrib/innosetup/setup.iss
@@ -3,7 +3,7 @@
 
 #define MyAppName "OneWorld Core"
 #define MyAppPublisher "2021 DECENOMY Core Developers"
-#define MyAppURL "https://oneworldcoin.io/"
+#define MyAppURL "https://owocoin.net/"
 #define MyAppExeName "oneworld-qt.exe"
 #define MyAppExtraData "https://explorer.decenomy.net/bootstraps/OWO/bootstrap.zip"
 #define MyAppVersion GetVersionNumbersString(".\package\" + MyAppExeName)

diff --git a/doc/README.md b/doc/README.md
@@ -3,7 +3,7 @@ OneWorld Core
 
 Setup
 ---------------------
-[OneWorld Core](https://oneworldcoin.io/) is the original OneWorld client and it builds the backbone of the network. However, it downloads and stores the entire history of OneWorld transactions; depending on the speed of your computer and network connection, the synchronization process can take anywhere from a few hours to a day or more. Thankfully you only have to do this once.
+[OneWorld Core](https://owocoin.net/) is the original OneWorld client and it builds the backbone of the network. However, it downloads and stores the entire history of OneWorld transactions; depending on the speed of your computer and network connection, the synchronization process can take anywhere from a few hours to a day or more. Thankfully you only have to do this once.
 
 Running
 ---------------------
@@ -55,7 +55,7 @@ The OneWorld repo's [root README](/README.md) contains relevant information on t
 - [Dnsseed Policy](dnsseed-policy.md)
 
 ### Resources
-* Discuss on the [OneWorld Homepage](https://oneworldcoin.io/).
+* Discuss on the [OneWorld Homepage](https://owocoin.net/).
 * Join the [OneWorld Discord](https://discord.gg/Wa4Z7YWyMz).
 
 ### Miscellaneous

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
@@ -345,15 +345,15 @@ class CMainParams : public CChainParams
         pchMessageStart[3] = 0x19;
         nDefaultPort = 32112;
 
-        vSeeds.push_back(CDNSSeedData("seeder", "seeder.oneworldcoin.io"));
-	    vSeeds.push_back(CDNSSeedData("seed1", "seed1.oneworldcoin.io"));
-        vSeeds.push_back(CDNSSeedData("seed2", "seed2.oneworldcoin.io"));
-        vSeeds.push_back(CDNSSeedData("seed3", "seed3.oneworldcoin.io"));
-        vSeeds.push_back(CDNSSeedData("seed4", "seed4.oneworldcoin.io"));
-	    vSeeds.push_back(CDNSSeedData("seed5", "seed5.oneworldcoin.io"));
-	    vSeeds.push_back(CDNSSeedData("seed6", "seed6.oneworldcoin.io"));
-	    vSeeds.push_back(CDNSSeedData("seed7", "seed7.oneworldcoin.io"));
-	    vSeeds.push_back(CDNSSeedData("seed8", "seed8.oneworldcoin.io"));
+        vSeeds.push_back(CDNSSeedData("seeder", "seeder.owocoin.net"));
+	    vSeeds.push_back(CDNSSeedData("seed1", "seed1.owocoin.net"));
+        vSeeds.push_back(CDNSSeedData("seed2", "seed2.owocoin.net"));
+        vSeeds.push_back(CDNSSeedData("seed3", "seed3.owocoin.net"));
+        vSeeds.push_back(CDNSSeedData("seed4", "seed4.owocoin.net"));
+	    vSeeds.push_back(CDNSSeedData("seed5", "seed5.owocoin.net"));
+	    vSeeds.push_back(CDNSSeedData("seed6", "seed6.owocoin.net"));
+	    vSeeds.push_back(CDNSSeedData("seed7", "seed7.owocoin.net"));
+	    vSeeds.push_back(CDNSSeedData("seed8", "seed8.owocoin.net"));
 
         base58Prefixes[PUBKEY_ADDRESS] = std::vector<unsigned char>(1, 115); // o
         base58Prefixes[SCRIPT_ADDRESS] = std::vector<unsigned char>(1, 112); // n

diff --git a/src/qt/locale/pivx_de.ts b/src/qt/locale/pivx_de.ts
@@ -3511,8 +3511,8 @@ Es gab ein Problem bei dem Versuch die Adressen unter %1 zu speichern. Bitte ver
         <translation>2) Wieso kann ich meine OWO nicht ausgeben?</translation>
     </message>
     <message>
-        <source>https://oneworldcoin.io/</source>
-        <translation>https://oneworldcoin.io/</translation>
+        <source>https://owocoin.net/</source>
+        <translation>https://owocoin.net/</translation>
     </message>
     <message>
         <source>1</source>

diff --git a/src/qt/locale/pivx_en.ts b/src/qt/locale/pivx_en.ts
@@ -4395,7 +4395,7 @@ There was an error trying to save the address list to %1. Please try again.</sou
     </message>
     <message>
         <location line="+148"/>
-        <source>https://oneworldcoin.io/</source>
+        <source>https://owocoin.net/</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

diff --git a/src/qt/locale/pivx_en_US.ts b/src/qt/locale/pivx_en_US.ts
@@ -3519,8 +3519,8 @@ There was an error trying to save the address list to %1. Please try again.</tra
         <translation>2) Why are my OWO unspendable?</translation>
     </message>
     <message>
-        <source>https://oneworldcoin.io/</source>
-        <translation>https://oneworldcoin.io/</translation>
+        <source>https://owocoin.net/</source>
+        <translation>https://owocoin.net/</translation>
     </message>
     <message>
         <source>1</source>

diff --git a/src/qt/locale/pivx_es.ts b/src/qt/locale/pivx_es.ts
@@ -3512,8 +3512,8 @@ Ha habido un error al tratar de guardar la libreta de direcciones en %1. Por fav
         <translation>2) ¿Por qué mis OWO no se pueden gastar?</translation>
     </message>
     <message>
-        <source>https://oneworldcoin.io/</source>
-        <translation>https://oneworldcoin.io/</translation>
+        <source>https://owocoin.net/</source>
+        <translation>https://owocoin.net/</translation>
     </message>
     <message>
         <source>1</source>

diff --git a/src/qt/locale/pivx_fr_FR.ts b/src/qt/locale/pivx_fr_FR.ts
@@ -3512,8 +3512,8 @@ Il y a eu une erreur de sauvegarde de la liste d'adresses vers %1. SVP rééssay
         <translation>2) Pourquoi mes OWO ne peuvent pas être dépensés?</translation>
     </message>
     <message>
-        <source>https://oneworldcoin.io/</source>
-        <translation>https://oneworldcoin.io/</translation>
+        <source>https://owocoin.net/</source>
+        <translation>https://owocoin.net/</translation>
     </message>
     <message>
         <source>1</source>

diff --git a/src/qt/locale/pivx_hr_HR.ts b/src/qt/locale/pivx_hr_HR.ts
@@ -3441,8 +3441,8 @@ Došlo je do greške prilikom spremanja popisa adresa u %1. Molimo pokušajte po
         <translation>2) Zašto se moji OWO ne mogu potrošiti?</translation>
     </message>
     <message>
-        <source>https://oneworldcoin.io/</source>
-        <translation>https://oneworldcoin.io/</translation>
+        <source>https://owocoin.net/</source>
+        <translation>https://owocoin.net/</translation>
     </message>
     <message>
         <source>1</source>

diff --git a/src/qt/locale/pivx_it.ts b/src/qt/locale/pivx_it.ts
@@ -3515,8 +3515,8 @@ Si è verificato un errore nel tentativo di salvare l'elenco degli indirizzi in
         <translation>2) Perché i miei OWO non sono spendibili?</translation>
     </message>
     <message>
-        <source>https://oneworldcoin.io/</source>
-        <translation>https://oneworldcoin.io/</translation>
+        <source>https://owocoin.net/</source>
+        <translation>https://owocoin.net/</translation>
     </message>
     <message>
         <source>1</source>

diff --git a/src/qt/locale/pivx_nl.ts b/src/qt/locale/pivx_nl.ts
@@ -3515,8 +3515,8 @@ Er was een fout opgetreden tijdens het opslaan van deze adreslijst naar %1. Prob
         <translation>2) Waarom is mijn OWO niet besteedbaar?</translation>
     </message>
     <message>
-        <source>https://oneworldcoin.io/</source>
-        <translation>https://oneworldcoin.io/</translation>
+        <source>https://owocoin.net/</source>
+        <translation>https://owocoin.net/</translation>
     </message>
     <message>
         <source>1</source>

diff --git a/src/qt/locale/pivx_ru.ts b/src/qt/locale/pivx_ru.ts
@@ -3509,8 +3509,8 @@ There was an error trying to save the address list to %1. Please try again.</sou
         <translation>2) Почему мои OWO невозможно потратить?</translation>
     </message>
     <message>
-        <source>https://oneworldcoin.io/</source>
-        <translation>https://oneworldcoin.io/</translation>
+        <source>https://owocoin.net/</source>
+        <translation>https://owocoin.net/</translation>
     </message>
     <message>
         <source>1</source>

diff --git a/src/qt/pivx/settings/forms/settingsfaqwidget.ui b/src/qt/pivx/settings/forms/settingsfaqwidget.ui
@@ -342,7 +342,7 @@
                   <enum>Qt::NoFocus</enum>
                  </property>
                  <property name="text">
-                  <string>https://oneworldcoin.io/</string>
+                  <string>https://owocoin.net/</string>
                  </property>
                 </widget>
                </item>