Merge master into develop

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Next version
 
+- Update licenses:
+  - Change license of Contants.sol and TickLib.sol from BUSL-1.1 to MIT
+  - Replace Unlicense and BSD-2-Clause with MIT
+  - Replace AGPL-3.0 with AGPL-3.0-or-later
+  - Consistently use AGPL-3.0-or-later for tools, scripts, and tests
+  - Restore MIT license for OpenZeppelin code
+
 # 2.0.0
 
 - New tick-based API with constant-gas insert, update, and retract of offers (the volume-based API is still available)

LICENSE

@@ -3,9 +3,12 @@ Copyright (c)-2023 ADDMA (Mangrove Association). All rights reserved.
 The files in this repo are covered by different licenses:
 
 * Mangrove Core contracts are licensed under Business Source License 1.1.
-* Contract interfaces (ABIs) are licensed under Unlicense (i.e. they are public domain).
-* Tools and other pieces of code are licensed under BSD 2-Clause License
-    or GNU AFFERO GENERAL PUBLIC LICENSE v3.
+* Contract interfaces (ABIs) and libraries useful for integrating with Mangrove
+    are licensed under MIT License.
+* Tools, scripts, tests, and other pieces of code are licensed under
+    GNU AFFERO GENERAL PUBLIC LICENSE v3 or any later version.
+* OpenZeppelin code in ERC20.sol and ERC20Lib.sol is covered by the original
+    MIT License (text included below).
 
 Each file header contains the SPDX license identifier of the license for that file.
 For more information about SPDX, please refer to <https://spdx.dev/>.
@@ -780,44 +783,39 @@ For more information on this, and how to apply and follow the GNU AGPL, see
 
 -------------------------------------------------------------------------------
 
-BSD 2-Clause License
+MIT License
 
-Copyright (c), ADDMA (Mangrove Association)
-All rights reserved.
+Copyright (c) 2023 ADDMA (Mangrove Association)
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
+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:
 
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+The above copyright notice and this permission notice (including the next paragraph) shall be included in all copies or substantial portions of the Software.
 
+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.
 
 
 -------------------------------------------------------------------------------
-
-The Unlicense
-
-This is free and unencumbered software released into the public domain.
-
-Anyone is free to copy, modify, publish, use, compile, sell, or distribute this software, either in source code form or as a compiled binary, for any purpose, commercial or non-commercial, and by any means.
-
-In jurisdictions that recognize copyright laws, the author or authors of this software dedicate any and all copyright interest in the software to the public domain. We make this dedication for the benefit of the public at large and to the detriment of our heirs and successors. We intend this dedication to be an overt act of relinquishment in perpetuity of all present and future rights to this software under copyright law.
-
-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 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.
-
-For more information, please refer to <https://unlicense.org/>
+OpenZeppelin MIT License
+-------------------------------------------------------------------------------
+The MIT License (MIT)
+
+Copyright (c) 2016-2023 zOS Global Limited and contributors
+
+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:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+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.

lib/Debug.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Unlicense
+// SPDX-License-Identifier: MIT
 
 pragma solidity ^0.8.13;
 

lib/IERC20.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Unlicense
+// SPDX-License-Identifier: MIT
 pragma solidity >=0.6.2;
 
 interface IERC20 {

lib/Script2.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier:	AGPL-2.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 pragma solidity ^0.8.13;
 
 import {Script} from "@mgv/forge-std/Script.sol";

lib/Test2.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier:	AGPL-3.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 pragma solidity ^0.8.13;
 
 import {Test, console2} from "@mgv/forge-std/Test.sol";

lib/ToyENS.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Unlicense
+// SPDX-License-Identifier: MIT
 pragma solidity ^0.8.13;
 
 /* Onchain contract registry with the following features:

lib/TransferLib.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier:	BSD-2-Clause
+// SPDX-License-Identifier: MIT
 pragma solidity ^0.8.10;
 
 import "@mgv/src/core/MgvLib.sol";

lib/core/Constants.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: BUSL-1.1
+// SPDX-License-Identifier: MIT
 pragma solidity ^0.8.17;
 
 /* The constants below are written as literals to optimize gas. For all the relevant constants here, the non-literal expression that computes them is checked in `Constants.t.sol`. */

lib/core/LocalExtra.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Unlicense
+// SPDX-License-Identifier: MIT
 pragma solidity ^0.8.17;
 
 import {Bin,TickTreeLib,Field} from "@mgv/lib/core/TickTreeLib.sol";

lib/core/OfferDetailExtra.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Unlicense
+// SPDX-License-Identifier: MIT
 pragma solidity ^0.8.17;
 
 import {OfferDetail,OfferDetailUnpacked} from "@mgv/src/preprocessed/OfferDetail.post.sol";

lib/core/OfferExtra.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Unlicense
+// SPDX-License-Identifier: MIT
 pragma solidity ^0.8.17;
 
 import "@mgv/lib/core/TickTreeLib.sol";

lib/core/TickLib.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: BUSL-1.1
+// SPDX-License-Identifier: MIT
 pragma solidity ^0.8.17;
 
 import {Bin} from "@mgv/lib/core/TickTreeLib.sol";

lib/preprocessed/ToString.post.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Unlicense
+// SPDX-License-Identifier: MIT
 
 pragma solidity ^0.8.13;
 

preprocessing/Struct.pre.sol.ts

@@ -1,7 +1,8 @@
+// SPDX-License-Identifier: AGPL-3.0-or-later
 import { format, tabulate } from "./lib/format";
 
 export const template = ({ preamble, struct_utilities, struct: s }) => {
-  return format`// SPDX-License-Identifier: Unlicense
+  return format`// SPDX-License-Identifier: MIT
 
 pragma solidity ^0.8.13;
 

preprocessing/StructTest.pre.sol.ts

@@ -1,7 +1,8 @@
+// SPDX-License-Identifier: AGPL-3.0-or-later
 import { format, tabulate } from "./lib/format";
 
 export const template = ({ preamble, struct_utilities, struct: s }) => {
-  return format`// SPDX-License-Identifier:	AGPL-3.0
+  return format`// SPDX-License-Identifier: AGPL-3.0-or-later
 
 pragma solidity ^0.8.13;
 

preprocessing/Structs.pre.sol.ts

@@ -1,7 +1,8 @@
+// SPDX-License-Identifier: AGPL-3.0-or-later
 import { format } from "./lib/format";
 
 export const template = ({ preamble, structs }) => {
-  return format`// SPDX-License-Identifier: Unlicense
+  return format`// SPDX-License-Identifier: MIT
 
 pragma solidity ^0.8.13;
 

preprocessing/ToString.pre.sol.ts

@@ -1,8 +1,9 @@
+// SPDX-License-Identifier: AGPL-3.0-or-later
 import { format } from "./lib/format";
 
 
 export const template = ({ preamble, structs }) => {
-  return format`// SPDX-License-Identifier: Unlicense
+  return format`// SPDX-License-Identifier: MIT
 
 pragma solidity ^0.8.13;
 

preprocessing/lib/format.ts

@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
 // template tag that converts array to separate lines but keeps the current
 // indent level
 export const format = (strings: TemplateStringsArray, ...nuggets: any[]) => {

preprocessing/lib/preproc.ts

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: AGPL-3.0-or-later
 import * as util from "util";
 
 /*

preprocessing/run.ts

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: AGPL-3.0-or-later
 import * as fs from "fs";
 
 import struct_defs from "./structs";

preprocessing/structs.ts

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: AGPL-3.0-or-later
 /* # Mangrove Summary
    * Mangrove holds offer lists for `outbound_tkn`,`inbound_tkn` pairs with a given `tickSpacing`.
    * Offers are sorted in a tree (the "tick tree") where each available price point (a `bin`) holds a doubly linked list of offers.

script/README.md

@@ -5,7 +5,7 @@ This directory contains scripts (`*.s.sol`) for deploying, configuring, and gove
 This is a script example:
 
 ```solidity
-// SPDX-License-Identifier:	AGPL-3.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // This script is SmallMgvReaderDeployer.s.sol
 pragma solidity ^0.8.13;
 

script/core/ActivateMarket.s.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier:	AGPL-3.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 pragma solidity ^0.8.13;
 
 import {Deployer} from "@mgv/script/lib/Deployer.sol";

script/core/ActivateSemibook.s.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier:	AGPL-3.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 pragma solidity ^0.8.13;
 
 import {Deployer} from "@mgv/script/lib/Deployer.sol";

script/core/DeactivateMarket.s.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier:	AGPL-3.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 pragma solidity ^0.8.13;
 
 import {Deployer} from "@mgv/script/lib/Deployer.sol";

script/core/UseOracle.s.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier:	AGPL-3.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 pragma solidity ^0.8.13;
 
 import {Deployer} from "@mgv/script/lib/Deployer.sol";

script/core/deployers/ArbitrumMangroveDeployer.s.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier:	AGPL-3.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 pragma solidity ^0.8.13;
 
 import {ToyENS} from "@mgv/lib/ToyENS.sol";

script/core/deployers/MangroveDeployer.s.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Unlicense
+// SPDX-License-Identifier: AGPL-3.0-or-later
 pragma solidity ^0.8.13;
 
 import {Mangrove} from "@mgv/src/core/Mangrove.sol";

script/core/deployers/MumbaiMangroveDeployer.s.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier:	AGPL-3.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 pragma solidity ^0.8.13;
 
 import {ToyENS} from "@mgv/lib/ToyENS.sol";

script/core/deployers/PolygonMangroveDeployer.s.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier:	AGPL-3.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 pragma solidity ^0.8.13;
 
 import {ToyENS} from "@mgv/lib/ToyENS.sol";

script/core/monitors/EvalSnipeOffer.s.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier:	AGPL-3.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 pragma solidity ^0.8.13;
 
 import {Deployer} from "@mgv/script/lib/Deployer.sol";

script/core/monitors/MarketHealth.s.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier:	AGPL-3.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 pragma solidity ^0.8.13;
 
 import {Deployer} from "@mgv/script/lib/Deployer.sol";

script/lib/Deployer.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier:	AGPL-3.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 pragma solidity ^0.8.13;
 
 import {Script2} from "@mgv/lib/Script2.sol";

script/lib/GetTokenDealSlot.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier:	AGPL-3.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 pragma solidity ^0.8.13;
 
 import {Deployer} from "@mgv/script/lib/Deployer.sol";

script/periphery/CopyOpenSemibooks.s.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier:	AGPL-3.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 pragma solidity ^0.8.13;
 
 import "@mgv/src/periphery/MgvReader.sol";

script/periphery/UpdateMarket.s.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier:	AGPL-3.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 pragma solidity ^0.8.13;
 
 import "@mgv/src/periphery/MgvReader.sol";

script/periphery/deployers/MgvReaderDeployer.s.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Unlicense
+// SPDX-License-Identifier: AGPL-3.0-or-later
 pragma solidity ^0.8.13;
 
 import {Script, console} from "@mgv/forge-std/Script.sol";

script/toy/deployers/ERC20Deployer.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier:	AGPL-3.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 pragma solidity ^0.8.13;
 
 import "@mgv/src/core/MgvLib.sol";

script/toy/deployers/PixieMATICDeployer.s.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Unlicense
+// SPDX-License-Identifier: AGPL-3.0-or-later
 pragma solidity ^0.8.13;
 
 import {Script, console} from "@mgv/forge-std/Script.sol";

script/toy/deployers/PixieUSDCDeployer.s.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Unlicense
+// SPDX-License-Identifier: AGPL-3.0-or-later
 pragma solidity ^0.8.13;
 
 import {Script, console} from "@mgv/forge-std/Script.sol";

src/IMangrove.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Unlicense
+// SPDX-License-Identifier: MIT
 // This file must be kept up-to-date with the actual Mangrove interface.
 
 pragma solidity >=0.7.0 <0.9.0;

src/core/MgvLib.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Unlicense
+// SPDX-License-Identifier: MIT
 
 /* `MgvLib` contains data structures returned by external calls to Mangrove and the interfaces it uses for its own external calls. */
 

src/preprocessed/Global.post.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Unlicense
+// SPDX-License-Identifier: MIT
 
 pragma solidity ^0.8.13;
 

src/preprocessed/Local.post.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Unlicense
+// SPDX-License-Identifier: MIT
 
 pragma solidity ^0.8.13;
 

src/preprocessed/Offer.post.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Unlicense
+// SPDX-License-Identifier: MIT
 
 pragma solidity ^0.8.13;
 

src/preprocessed/OfferDetail.post.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Unlicense
+// SPDX-License-Identifier: MIT
 
 pragma solidity ^0.8.13;
 

src/preprocessed/Structs.post.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Unlicense
+// SPDX-License-Identifier: MIT
 
 pragma solidity ^0.8.13;