Merge pull request #106 from morpho-dao/fix/license

Rubilmax · web-flow · commit 3df181f5ca72 · 2022-12-28T17:20:56.000+01:00
Set valid SPDX License Identifier
diff --git a/LICENSE b/LICENSE
diff --git a/package.json b/package.json
@@ -3,8 +3,8 @@
   "version": "1.0.0",
   "description": "Data structures for Morpho's matching engine",
   "repository": "https://github.com/morpho-protocol/morpho-data-structures.git",
-  "author": "MerlinEgalite <egalite.merlin@gmail.com>",
-  "license": "MIT",
+  "author": "Morpho Labs <security@morpho.xyz>",
+  "license": "AGPL-3.0-only",
   "scripts": {
     "test": "npx hardhat test test-ts/*.ts",
     "coverage": "npx hardhat coverage",
diff --git a/src/DoubleLinkedList.sol b/src/DoubleLinkedList.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GNU AGPLv3
+// SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity ^0.8.0;
 
 library DoubleLinkedList {
diff --git a/src/Heap.sol b/src/Heap.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GNU AGPLv3
+// SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity ^0.8.0;
 
 library BasicHeap {
diff --git a/src/HeapOrdering.sol b/src/HeapOrdering.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GNU AGPLv3
+// SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity ^0.8.0;
 
 import "@openzeppelin/contracts/utils/math/SafeCast.sol";
diff --git a/src/RedBlackBinaryTree.sol b/src/RedBlackBinaryTree.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GNU AGPLv3
+// SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity ^0.8.0;
 
 // A Solidity Red-Black Tree library to store and maintain a sorted data structure in a Red-Black binary search tree,
diff --git a/src/RedBlackBinaryTreeOptimized.sol b/src/RedBlackBinaryTreeOptimized.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GNU AGPLv3
+// SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity ^0.8.0;
 
 // A Solidity Red-Black Tree library to store and maintain a sorted data structure in a Red-Black binary search tree,
diff --git a/src/ThreeHeapOrdering.sol b/src/ThreeHeapOrdering.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GNU AGPLv3
+// SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity ^0.8.0;
 
 import "@openzeppelin/contracts/utils/math/SafeCast.sol";
diff --git a/src/test/TestRedBlackBinaryTree.sol b/src/test/TestRedBlackBinaryTree.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: UNLICENSED
+// SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity ^0.8.0;
 
 import "../RedBlackBinaryTree.sol";
diff --git a/src/test/TestRedBlackBinaryTreeOptimized.sol b/src/test/TestRedBlackBinaryTreeOptimized.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: UNLICENSED
+// SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity ^0.8.0;
 
 import "../RedBlackBinaryTreeOptimized.sol";
diff --git a/test/TestCommonHeapOrdering.t.sol b/test/TestCommonHeapOrdering.t.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GNU AGPLv3
+// SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity ^0.8.0;
 
 import "forge-std/Test.sol";
diff --git a/test/TestDoubleLinkedList.t.sol b/test/TestDoubleLinkedList.t.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GNU AGPLv3
+// SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity ^0.8.0;
 
 import "forge-std/Test.sol";
diff --git a/test/TestHeap.t.sol b/test/TestHeap.t.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GNU AGPLv3
+// SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity ^0.8.0;
 
 import "forge-std/Test.sol";
diff --git a/test/TestHeapOrdering.t.sol b/test/TestHeapOrdering.t.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GNU AGPLv3
+// SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity ^0.8.0;
 
 import "./TestCommonHeapOrdering.t.sol";
diff --git a/test/TestHeapOrderingInvariant.t.sol b/test/TestHeapOrderingInvariant.t.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GNU AGPLv3
+// SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity ^0.8.0;
 
 import "forge-std/Test.sol";
diff --git a/test/TestStressHeap.t.sol b/test/TestStressHeap.t.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GNU AGPLv3
+// SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity ^0.8.0;
 
 import "forge-std/Test.sol";
diff --git a/test/TestThreeHeapOrdering.t.sol b/test/TestThreeHeapOrdering.t.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GNU AGPLv3
+// SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity ^0.8.0;
 
 import "./TestCommonHeapOrdering.t.sol";
diff --git a/test/TestThreeHeapOrderingInvariant.t.sol b/test/TestThreeHeapOrderingInvariant.t.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GNU AGPLv3
+// SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity ^0.8.0;
 
 import "forge-std/Test.sol";
diff --git a/test/helpers/ConcreteHeapOrdering.sol b/test/helpers/ConcreteHeapOrdering.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GNU AGPLv3
+// SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity ^0.8.0;
 
 import "src/HeapOrdering.sol";
diff --git a/test/helpers/ConcreteThreeHeapOrdering.sol b/test/helpers/ConcreteThreeHeapOrdering.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GNU AGPLv3
+// SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity ^0.8.0;
 
 import "src/ThreeHeapOrdering.sol";
diff --git a/test/helpers/IConcreteHeapOrdering.sol b/test/helpers/IConcreteHeapOrdering.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GNU AGPLv3
+// SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity ^0.8.0;
 
 interface IConcreteHeapOrdering {
diff --git a/test/helpers/Random.sol b/test/helpers/Random.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: UNLICENSED
+// SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity ^0.8.13;
 
 contract Random {
diff --git a/test/helpers/TestRandomHeap.sol b/test/helpers/TestRandomHeap.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GNU AGPLv3
+// SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity ^0.8.13;
 
 import "./Random.sol";

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// SPDX-License-Identifier: GNU AGPLv3`
	`1`	`+// SPDX-License-Identifier: AGPL-3.0-only`
`2`	`2`	`pragma solidity ^0.8.0;`
`3`	`3`
`4`	`4`	`library DoubleLinkedList {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// SPDX-License-Identifier: UNLICENSED`
	`1`	`+// SPDX-License-Identifier: AGPL-3.0-only`
`2`	`2`	`pragma solidity ^0.8.0;`
`3`	`3`
`4`	`4`	`import "../RedBlackBinaryTree.sol";`