update license of Cuckoo

meritlabs · May 17, 2018 · 7c54dfd · 7c54dfd
1 parent 10421ab
commit 7c54dfd
Show file tree

Hide file tree

Showing 13 changed files with 95 additions and 13 deletions.
diff --git a/compat.h b/compat.h
@@ -7,7 +7,7 @@
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
  * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.  See COPYING for more details.
+ * any later version.  See LICENSE.md for more details.
  */
 
 #ifndef __COMPAT_H__

diff --git a/cpu-miner.c b/cpu-miner.c
@@ -6,7 +6,7 @@
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
  * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.  See COPYING for more details.
+ * any later version.  See LICENSE.md for more details.
  */
 
 #include "cpuminer-config.h"

diff --git a/cuckoo.h b/cuckoo.h
@@ -5,7 +5,7 @@
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
  * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.  See COPYING for more details.
+ * any later version.  See LICENSE.md for more details.
  */
 
 #ifndef MERIT_MINER_CUCKOO_H

diff --git a/cuckoo/LICENSE.md b/cuckoo/LICENSE.md
@@ -0,0 +1,31 @@
+The FAIR MINING License
+
+Copyright (c) 2013-2018 John Tromp
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+FAIR MINING
+Any derived miner that charges a developer fee for mining a fair coin
+---one with no premine or other form of developer compensation---
+shall offer to share half the fee revenue with the coin developers.
+
+The above copyright notice, FAIR MINING condition, and this permission notice
+shall be included in all copies or substantial portions of the Software.
+
+
+ALTERNATIVELY, this software may be distributed under the terms of the
+GNU General Public License ("GPL") version 2 or later, as published by
+the Free Software Foundation.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/cuckoo/README.md b/cuckoo/README.md
@@ -0,0 +1,11 @@
+# Cuckoo Cycle
+
+Cuckoo Cycle is the first graph-theoretic proof-of-work, and the most memory bound, yet with instant verification. 
+Unlike Hashcash, Cuckoo Cycle is immune from quantum speedup by Grover's search algorithm.
+
+For more info check out (Cuckoo Cycle Repo)[https://github.com/tromp/cuckoo]
+
+# License
+
+Original work is licensed under The FAIR MINING License and GNU General Public License ("GPL") version 2.
+See (LICENSE)[cuckoo/LICENSE.md] for details.
diff --git a/cuckoo/cuckoo.cpp b/cuckoo/cuckoo.cpp
@@ -1,6 +1,14 @@
-// Cuckoo Cycle, a memory-hard proof-of-work
-// Copyright (c) 2013-2018 John Tromp
-// Copyright (c) 2017-2018 The Merit Foundation developers
+/*
+ * Cuckoo Cycle, a memory-hard proof-of-work
+ * Copyright (c) 2013-2018 John Tromp
+ * Copyright (c) 2017-2018 The Merit Foundation developers
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the The FAIR MINING License and, alternatively, 
+ * GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.  See LICENSE.md for more details.
+ **/
 
 #include "cuckoo.hpp"
 #include "blake2/blake2.h"

diff --git a/cuckoo/cuckoo.hpp b/cuckoo/cuckoo.hpp
@@ -1,6 +1,14 @@
-// Cuckoo Cycle, a memory-hard proof-of-work
-// Copyright (c) 2013-2017 John Tromp
-// Copyright (c) 2017-2018 The Merit Foundation developers
+/*
+ * Cuckoo Cycle, a memory-hard proof-of-work
+ * Copyright (c) 2013-2017 John Tromp
+ * Copyright (c) 2017-2018 The Merit Foundation developers
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the The FAIR MINING License and, alternatively, 
+ * GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.  See LICENSE.md for more details.
+ **/
 
 #ifndef MERIT_MINER_CUCKOO_H
 #define MERIT_MINER_CUCKOO_H

diff --git a/cuckoo/siphash.h b/cuckoo/siphash.h
@@ -1,3 +1,15 @@
+/*
+ * Cuckoo Cycle, a memory-hard proof-of-work
+ * Copyright (c) 2013-2018 John Tromp
+ * Copyright (c) 2017-2018 The Merit Foundation developers
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the The FAIR MINING License and, alternatively, 
+ * GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.  See LICENSE.md for more details.
+ **/
+
 #ifndef MERIT_MINER_SIPHASH_H
 #define MERIT_MINER_SIPHASH_H
 

diff --git a/cuckoo/siphashxN.h b/cuckoo/siphashxN.h
@@ -1,3 +1,15 @@
+/*
+ * Cuckoo Cycle, a memory-hard proof-of-work
+ * Copyright (c) 2013-2018 John Tromp
+ * Copyright (c) 2017-2018 The Merit Foundation developers
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the The FAIR MINING License and, alternatively, 
+ * GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.  See LICENSE.md for more details.
+ **/
+
 #ifndef INCLUDE_SIPHASHXN_H
 #define INCLUDE_SIPHASHXN_H
 #ifdef __AVX2__

diff --git a/elist.h b/elist.h
@@ -7,7 +7,7 @@
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
  * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.  See COPYING for more details.
+ * any later version.  See LICENSE.md for more details.
  */
 
 #ifndef _LINUX_LIST_H

diff --git a/miner.h b/miner.h
@@ -7,7 +7,7 @@
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
  * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.  See COPYING for more details.
+ * any later version.  See LICENSE.md for more details.
  */
 
 #ifndef __MINER_H__

diff --git a/sha2.c b/sha2.c
@@ -6,7 +6,7 @@
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
  * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.  See COPYING for more details.
+ * any later version.  See LICENSE.md for more details.
  */
 
 #include "cpuminer-config.h"

diff --git a/util.c b/util.c
@@ -7,7 +7,7 @@
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
  * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.  See COPYING for more details.
+ * any later version.  See LICENSE.md for more details.
  */
 
 #define _GNU_SOURCE