From ba1abc45e8ef52aa6521c1c18fdb7876a5333fd6 Mon Sep 17 00:00:00 2001 From: Alexander Date: Thu, 18 Jan 2024 17:22:40 +0100 Subject: [PATCH] feat: set repo license --- evm/LICENSE | 96 +++++++++++++++++++ evm/script/config/config_contracts.json | 10 +- evm/src/CatalystChainInterface.sol | 3 +- evm/src/CatalystFactory.sol | 3 +- evm/src/CatalystPayload.sol | 3 +- evm/src/CatalystVaultAmplified.sol | 3 +- evm/src/CatalystVaultCommon.sol | 3 +- evm/src/CatalystVaultVolatile.sol | 3 +- evm/src/ICatalystV1Vault.sol | 3 +- evm/src/IntegralsAmplified.sol | 3 +- evm/src/IntegralsVolatile.sol | 3 +- .../interfaces/ICatalystChainInterface.sol | 1 + evm/src/interfaces/ICatalystV1Factory.sol | 1 + .../interfaces/ICatalystV1FactoryEvents.sol | 2 +- .../interfaces/ICatalystV1Underwriting.sol | 2 +- .../ICatalystV1VaultAdministration.sol | 2 +- .../interfaces/ICatalystV1VaultDerived.sol | 2 +- evm/src/interfaces/ICatalystV1VaultErrors.sol | 2 +- evm/src/interfaces/ICatalystV1VaultEvents.sol | 2 +- .../interfaces/ICatalystV1VaultImmutables.sol | 2 +- .../ICatalystV1VaultPermissionless.sol | 3 +- evm/src/interfaces/ICatalystV1VaultState.sol | 3 +- .../ICatalystV1VaultSuccessFailure.sol | 2 +- evm/src/interfaces/IOnCatalyst.sol | 3 +- evm/src/registry/CatalystDescriber.sol | 1 - .../registry/CatalystDescriberRegistry.sol | 1 - evm/src/registry/CatalystMathAmp.sol | 1 - evm/src/registry/CatalystMathVol.sol | 1 - .../interfaces/ICatalystDescriber.sol | 1 - .../interfaces/ICatalystMathLibAmp.sol | 1 - .../interfaces/ICatalystMathLibCommon.sol | 1 - .../interfaces/ICatalystMathLibVol.sol | 1 - evm/src/registry/lib/Contains.sol | 1 - 33 files changed, 123 insertions(+), 46 deletions(-) create mode 100644 evm/LICENSE diff --git a/evm/LICENSE b/evm/LICENSE new file mode 100644 index 00000000..5857d0cc --- /dev/null +++ b/evm/LICENSE @@ -0,0 +1,96 @@ +Business Source License 1.1 + +License text copyright (c) 2017 MariaDB Corporation Ab, All Rights Reserved. +"Business Source License" is a trademark of MariaDB Corporation Ab. + +----------------------------------------------------------------------------- + +Parameters + +Licensor: Cata Labs + +Licensed Work: Catalyst V1 + The Licensed Work is (c) 2024 Cata Labs + +Change Date: 2028-04-02 + +Change License: GNU General Public License v2.0 or later + +----------------------------------------------------------------------------- + +Terms + +The Licensor hereby grants you the right to copy, modify, create derivative +works, redistribute, and make non-production use of the Licensed Work. The +Licensor may make an Additional Use Grant, above, permitting limited +production use. + +Effective on the Change Date, or the fourth anniversary of the first publicly +available distribution of a specific version of the Licensed Work under this +License, whichever comes first, the Licensor hereby grants you rights under +the terms of the Change License, and the rights granted in the paragraph +above terminate. + +If your use of the Licensed Work does not comply with the requirements +currently in effect as described in this License, you must purchase a +commercial license from the Licensor, its affiliated entities, or authorized +resellers, or you must refrain from using the Licensed Work. + +All copies of the original and modified Licensed Work, and derivative works +of the Licensed Work, are subject to this License. This License applies +separately for each version of the Licensed Work and the Change Date may vary +for each version of the Licensed Work released by Licensor. + +You must conspicuously display this License on each original or modified copy +of the Licensed Work. If you receive the Licensed Work in original or +modified form from a third party, the terms and conditions set forth in this +License apply to your use of that work. + +Any use of the Licensed Work in violation of this License will automatically +terminate your rights under this License for the current and all other +versions of the Licensed Work. + +This License does not grant you any right in any trademark or logo of +Licensor or its affiliates (provided that you may use a trademark or logo of +Licensor as expressly required by this License). + +TO THE EXTENT PERMITTED BY APPLICABLE LAW, THE LICENSED WORK IS PROVIDED ON +AN "AS IS" BASIS. LICENSOR HEREBY DISCLAIMS ALL WARRANTIES AND CONDITIONS, +EXPRESS OR IMPLIED, INCLUDING (WITHOUT LIMITATION) WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, AND +TITLE. + +MariaDB hereby grants you permission to use this License’s text to license +your works, and to refer to it using the trademark "Business Source License", +as long as you comply with the Covenants of Licensor below. + +----------------------------------------------------------------------------- + +Covenants of Licensor + +In consideration of the right to use this License’s text and the "Business +Source License" name and trademark, Licensor covenants to MariaDB, and to all +other recipients of the licensed work to be provided by Licensor: + +1. To specify as the Change License the GPL Version 2.0 or any later version, + or a license that is compatible with GPL Version 2.0 or a later version, + where "compatible" means that software provided under the Change License can + be included in a program with software provided under GPL Version 2.0 or a + later version. Licensor may specify additional Change Licenses without + limitation. + +2. To either: (a) specify an additional grant of rights to use that does not + impose any additional restriction on the right granted in this License, as + the Additional Use Grant; or (b) insert the text "None". + +3. To specify a Change Date. + +4. Not to modify this License in any other way. + +----------------------------------------------------------------------------- + +Notice + +The Business Source License (this document, or the "License") is not an Open +Source license. However, the Licensed Work will eventually be made available +under an Open Source License, as stated in this License. \ No newline at end of file diff --git a/evm/script/config/config_contracts.json b/evm/script/config/config_contracts.json index 094433dd..2fc17580 100644 --- a/evm/script/config/config_contracts.json +++ b/evm/script/config/config_contracts.json @@ -1,10 +1,10 @@ { "contracts": { - "amplified_mathlib": "0x78D79a629F2257307BB36B6D23703A609c5324bc", - "amplified_template": "0x0873617C820F300d07F8326B07caEDddC57b6DC2", - "factory": "0x228C03A59d5287344527C95333384CC17DcF4022", - "volatile_mathlib": "0xB21328C3EC55D125860E0D4bD817D0Db178f6549", - "volatile_template": "0xc3c1a3AC9737BB5407b69e6824f185539893a976" + "amplified_mathlib": "0xC2523cF07bF0bb130a132e8F748437aD75D9F4B6", + "amplified_template": "0x668BBC28675849Ef0C922109051ECd6790EeB75b", + "factory": "0x79B5768E5B9c2DCa173FdE9029A20fC90fb3e321", + "volatile_mathlib": "0x131C296a98197C4Da4eD376cCd4B9bAe5851C66E", + "volatile_template": "0xCc8a20A14616fF9d891Ce457C60Ede6cbA8aa4Dd" }, "registry": { "describer": "0xA9C609b79d62b9E27CDefA685CB795982f852d3c", diff --git a/evm/src/CatalystChainInterface.sol b/evm/src/CatalystChainInterface.sol index d2b34688..d9237e28 100644 --- a/evm/src/CatalystChainInterface.sol +++ b/evm/src/CatalystChainInterface.sol @@ -1,5 +1,4 @@ -//SPDX-License-Identifier: MIT - +//SPDX-License-Identifier: BUSL-1.1 pragma solidity ^0.8.19; import {ERC20} from 'solmate/tokens/ERC20.sol'; diff --git a/evm/src/CatalystFactory.sol b/evm/src/CatalystFactory.sol index c117b3cb..e25c43ef 100644 --- a/evm/src/CatalystFactory.sol +++ b/evm/src/CatalystFactory.sol @@ -1,5 +1,4 @@ -// SPDX-License-Identifier: UNLICENSED - +// SPDX-License-Identifier: BUSL-1.1 pragma solidity ^0.8.19; import { Ownable } from "openzeppelin-contracts/contracts/access/Ownable.sol"; diff --git a/evm/src/CatalystPayload.sol b/evm/src/CatalystPayload.sol index 008773fa..859baa54 100644 --- a/evm/src/CatalystPayload.sol +++ b/evm/src/CatalystPayload.sol @@ -1,5 +1,4 @@ -//SPDX-License-Identifier: UNLICENSED - +//SPDX-License-Identifier: MIT pragma solidity ^0.8.19; // Catalyst IBC payload structure *********************************************************************************************** diff --git a/evm/src/CatalystVaultAmplified.sol b/evm/src/CatalystVaultAmplified.sol index 9c4b4ca7..9eb0888f 100644 --- a/evm/src/CatalystVaultAmplified.sol +++ b/evm/src/CatalystVaultAmplified.sol @@ -1,5 +1,4 @@ -//SPDX-License-Identifier: UNLICENSED - +//SPDX-License-Identifier: BUSL-1.1 pragma solidity ^0.8.19; import { ERC20 } from 'solmate/tokens/ERC20.sol'; diff --git a/evm/src/CatalystVaultCommon.sol b/evm/src/CatalystVaultCommon.sol index 88792fab..8be59b5a 100644 --- a/evm/src/CatalystVaultCommon.sol +++ b/evm/src/CatalystVaultCommon.sol @@ -1,5 +1,4 @@ -//SPDX-License-Identifier: UNLICENSED - +//SPDX-License-Identifier: BUSL-1.1 pragma solidity ^0.8.19; import {ERC20} from 'solmate/tokens/ERC20.sol'; diff --git a/evm/src/CatalystVaultVolatile.sol b/evm/src/CatalystVaultVolatile.sol index aa1be652..2da6f586 100644 --- a/evm/src/CatalystVaultVolatile.sol +++ b/evm/src/CatalystVaultVolatile.sol @@ -1,5 +1,4 @@ -//SPDX-License-Identifier: UNLICENSED - +//SPDX-License-Identifier: BUSL-1.1 pragma solidity ^0.8.19; import { ERC20 } from 'solmate/tokens/ERC20.sol'; diff --git a/evm/src/ICatalystV1Vault.sol b/evm/src/ICatalystV1Vault.sol index 53a01d9f..b79a0452 100644 --- a/evm/src/ICatalystV1Vault.sol +++ b/evm/src/ICatalystV1Vault.sol @@ -1,5 +1,4 @@ -//SPDX-License-Identifier: UNLICENSED - +//SPDX-License-Identifier: BUSL-1.1 pragma solidity ^0.8.19; import "./interfaces/ICatalystV1VaultSuccessFailure.sol"; diff --git a/evm/src/IntegralsAmplified.sol b/evm/src/IntegralsAmplified.sol index 42985b32..9c929000 100644 --- a/evm/src/IntegralsAmplified.sol +++ b/evm/src/IntegralsAmplified.sol @@ -1,5 +1,4 @@ -//SPDX-License-Identifier: UNLICENSED - +//SPDX-License-Identifier: BUSL-1.1 pragma solidity ^0.8.19; import { FixedPointMathLib } from "solmate/utils/FixedPointMathLib.sol"; diff --git a/evm/src/IntegralsVolatile.sol b/evm/src/IntegralsVolatile.sol index 091d76f9..23dbde9f 100644 --- a/evm/src/IntegralsVolatile.sol +++ b/evm/src/IntegralsVolatile.sol @@ -1,5 +1,4 @@ -//SPDX-License-Identifier: UNLICENSED - +//SPDX-License-Identifier: BUSL-1.1 pragma solidity ^0.8.19; import { FixedPointMathLib } from "solmate/utils/FixedPointMathLib.sol"; diff --git a/evm/src/interfaces/ICatalystChainInterface.sol b/evm/src/interfaces/ICatalystChainInterface.sol index fb73dd6e..1110f4a6 100644 --- a/evm/src/interfaces/ICatalystChainInterface.sol +++ b/evm/src/interfaces/ICatalystChainInterface.sol @@ -1,3 +1,4 @@ +//SPDX-License-Identifier: MIT pragma solidity ^0.8.17; import { ICatalystV1Structs } from "./ICatalystV1VaultState.sol"; diff --git a/evm/src/interfaces/ICatalystV1Factory.sol b/evm/src/interfaces/ICatalystV1Factory.sol index 82c07354..c4da9eca 100644 --- a/evm/src/interfaces/ICatalystV1Factory.sol +++ b/evm/src/interfaces/ICatalystV1Factory.sol @@ -1,3 +1,4 @@ +//SPDX-License-Identifier: MIT pragma solidity ^0.8.17; import { ICatalystV1FactoryEvents } from "./ICatalystV1FactoryEvents.sol"; diff --git a/evm/src/interfaces/ICatalystV1FactoryEvents.sol b/evm/src/interfaces/ICatalystV1FactoryEvents.sol index ddd9d78c..b896300a 100644 --- a/evm/src/interfaces/ICatalystV1FactoryEvents.sol +++ b/evm/src/interfaces/ICatalystV1FactoryEvents.sol @@ -1,4 +1,4 @@ -//SPDX-License-Identifier: UNLICENSED +//SPDX-License-Identifier: MIT pragma solidity ^0.8.17; /// @title Events emitted by Catalyst v1 Factory diff --git a/evm/src/interfaces/ICatalystV1Underwriting.sol b/evm/src/interfaces/ICatalystV1Underwriting.sol index 5d4b4585..7146feb9 100644 --- a/evm/src/interfaces/ICatalystV1Underwriting.sol +++ b/evm/src/interfaces/ICatalystV1Underwriting.sol @@ -1,4 +1,4 @@ -//SPDX-License-Identifier: Unlicensed +//SPDX-License-Identifier: MIT pragma solidity ^0.8.17; /// @title Extensions to vaults which supports underwriting. diff --git a/evm/src/interfaces/ICatalystV1VaultAdministration.sol b/evm/src/interfaces/ICatalystV1VaultAdministration.sol index 41256062..b48d8ce4 100644 --- a/evm/src/interfaces/ICatalystV1VaultAdministration.sol +++ b/evm/src/interfaces/ICatalystV1VaultAdministration.sol @@ -1,4 +1,4 @@ -//SPDX-License-Identifier: UNLICENSED +//SPDX-License-Identifier: MIT pragma solidity ^0.8.17; /// @title Administrative actions defined by Catalyst v1 Vaults diff --git a/evm/src/interfaces/ICatalystV1VaultDerived.sol b/evm/src/interfaces/ICatalystV1VaultDerived.sol index 3e57738e..e7e5a138 100644 --- a/evm/src/interfaces/ICatalystV1VaultDerived.sol +++ b/evm/src/interfaces/ICatalystV1VaultDerived.sol @@ -1,4 +1,4 @@ -//SPDX-License-Identifier: UNLICENSED +//SPDX-License-Identifier: MIT pragma solidity ^0.8.17; /// @title Derived Vault state diff --git a/evm/src/interfaces/ICatalystV1VaultErrors.sol b/evm/src/interfaces/ICatalystV1VaultErrors.sol index 2475b3b5..d56308bc 100644 --- a/evm/src/interfaces/ICatalystV1VaultErrors.sol +++ b/evm/src/interfaces/ICatalystV1VaultErrors.sol @@ -1,4 +1,4 @@ -//SPDX-License-Identifier: UNLICENSED +//SPDX-License-Identifier: MIT pragma solidity ^0.8.17; error ExceedsSecurityLimit(); // 7c1e66d diff --git a/evm/src/interfaces/ICatalystV1VaultEvents.sol b/evm/src/interfaces/ICatalystV1VaultEvents.sol index 1b3b5795..0bffe3ef 100644 --- a/evm/src/interfaces/ICatalystV1VaultEvents.sol +++ b/evm/src/interfaces/ICatalystV1VaultEvents.sol @@ -1,4 +1,4 @@ -//SPDX-License-Identifier: UNLICENSED +//SPDX-License-Identifier: MIT pragma solidity ^0.8.17; /// @title Events emitted by Catalyst v1 Vaults diff --git a/evm/src/interfaces/ICatalystV1VaultImmutables.sol b/evm/src/interfaces/ICatalystV1VaultImmutables.sol index faf02bea..d8a877f1 100644 --- a/evm/src/interfaces/ICatalystV1VaultImmutables.sol +++ b/evm/src/interfaces/ICatalystV1VaultImmutables.sol @@ -1,4 +1,4 @@ -//SPDX-License-Identifier: UNLICENSED +//SPDX-License-Identifier: MIT pragma solidity ^0.8.17; /// @title Immutable vault state diff --git a/evm/src/interfaces/ICatalystV1VaultPermissionless.sol b/evm/src/interfaces/ICatalystV1VaultPermissionless.sol index b1ead74c..04f93b4d 100644 --- a/evm/src/interfaces/ICatalystV1VaultPermissionless.sol +++ b/evm/src/interfaces/ICatalystV1VaultPermissionless.sol @@ -1,5 +1,4 @@ -//SPDX-License-Identifier: UNLICENSED - +//SPDX-License-Identifier: MIT pragma solidity ^0.8.17; import { ICatalystV1Structs } from "./ICatalystV1VaultState.sol"; diff --git a/evm/src/interfaces/ICatalystV1VaultState.sol b/evm/src/interfaces/ICatalystV1VaultState.sol index d8587483..c95faaa4 100644 --- a/evm/src/interfaces/ICatalystV1VaultState.sol +++ b/evm/src/interfaces/ICatalystV1VaultState.sol @@ -1,7 +1,6 @@ -//SPDX-License-Identifier: UNLICENSED +//SPDX-License-Identifier: MIT pragma solidity ^0.8.17; - import { IMessageEscrowStructs } from "GeneralisedIncentives/src/interfaces/IMessageEscrowStructs.sol"; interface ICatalystV1Structs is IMessageEscrowStructs { diff --git a/evm/src/interfaces/ICatalystV1VaultSuccessFailure.sol b/evm/src/interfaces/ICatalystV1VaultSuccessFailure.sol index d804f01d..bd2d199d 100644 --- a/evm/src/interfaces/ICatalystV1VaultSuccessFailure.sol +++ b/evm/src/interfaces/ICatalystV1VaultSuccessFailure.sol @@ -1,4 +1,4 @@ -//SPDX-License-Identifier: UNLICENSED +//SPDX-License-Identifier: MIT pragma solidity ^0.8.17; /// @title Escrow related functions defined by Catalyst v1 Vaults diff --git a/evm/src/interfaces/IOnCatalyst.sol b/evm/src/interfaces/IOnCatalyst.sol index f8f929bd..c7e3395d 100644 --- a/evm/src/interfaces/IOnCatalyst.sol +++ b/evm/src/interfaces/IOnCatalyst.sol @@ -1,5 +1,4 @@ -//SPDX-License-Identifier: UNLICENSED - +//SPDX-License-Identifier: MIT pragma solidity ^0.8.17; interface ICatalystReceiver { diff --git a/evm/src/registry/CatalystDescriber.sol b/evm/src/registry/CatalystDescriber.sol index 743e0697..b7ba8c3b 100644 --- a/evm/src/registry/CatalystDescriber.sol +++ b/evm/src/registry/CatalystDescriber.sol @@ -1,5 +1,4 @@ //SPDX-License-Identifier: MIT - pragma solidity ^0.8.19; import "openzeppelin-contracts/contracts/access/Ownable.sol"; diff --git a/evm/src/registry/CatalystDescriberRegistry.sol b/evm/src/registry/CatalystDescriberRegistry.sol index aa549392..d1ffc051 100644 --- a/evm/src/registry/CatalystDescriberRegistry.sol +++ b/evm/src/registry/CatalystDescriberRegistry.sol @@ -1,5 +1,4 @@ //SPDX-License-Identifier: MIT - pragma solidity ^0.8.19; import "openzeppelin-contracts/contracts/access/Ownable.sol"; diff --git a/evm/src/registry/CatalystMathAmp.sol b/evm/src/registry/CatalystMathAmp.sol index dd55e649..b6ed08d7 100644 --- a/evm/src/registry/CatalystMathAmp.sol +++ b/evm/src/registry/CatalystMathAmp.sol @@ -1,5 +1,4 @@ //SPDX-License-Identifier: MIT - pragma solidity ^0.8.19; import {ERC20} from 'solmate/tokens/ERC20.sol'; diff --git a/evm/src/registry/CatalystMathVol.sol b/evm/src/registry/CatalystMathVol.sol index 4b439ac2..1ea8ebe6 100644 --- a/evm/src/registry/CatalystMathVol.sol +++ b/evm/src/registry/CatalystMathVol.sol @@ -1,5 +1,4 @@ //SPDX-License-Identifier: MIT - pragma solidity ^0.8.19; import {ERC20} from 'solmate/tokens/ERC20.sol'; diff --git a/evm/src/registry/interfaces/ICatalystDescriber.sol b/evm/src/registry/interfaces/ICatalystDescriber.sol index 16df5640..4daae3f0 100644 --- a/evm/src/registry/interfaces/ICatalystDescriber.sol +++ b/evm/src/registry/interfaces/ICatalystDescriber.sol @@ -1,5 +1,4 @@ //SPDX-License-Identifier: MIT - pragma solidity ^0.8.17; interface ICatalystDescriber { diff --git a/evm/src/registry/interfaces/ICatalystMathLibAmp.sol b/evm/src/registry/interfaces/ICatalystMathLibAmp.sol index 1cc0c4ab..b59b2df9 100644 --- a/evm/src/registry/interfaces/ICatalystMathLibAmp.sol +++ b/evm/src/registry/interfaces/ICatalystMathLibAmp.sol @@ -1,5 +1,4 @@ //SPDX-License-Identifier: MIT - pragma solidity ^0.8.17; import {ERC20} from 'solmate/tokens/ERC20.sol'; diff --git a/evm/src/registry/interfaces/ICatalystMathLibCommon.sol b/evm/src/registry/interfaces/ICatalystMathLibCommon.sol index ea8e752b..b6173d51 100644 --- a/evm/src/registry/interfaces/ICatalystMathLibCommon.sol +++ b/evm/src/registry/interfaces/ICatalystMathLibCommon.sol @@ -1,5 +1,4 @@ //SPDX-License-Identifier: MIT - pragma solidity ^0.8.17; import {ERC20} from 'solmate/tokens/ERC20.sol'; diff --git a/evm/src/registry/interfaces/ICatalystMathLibVol.sol b/evm/src/registry/interfaces/ICatalystMathLibVol.sol index 58619e0d..3887ba5e 100644 --- a/evm/src/registry/interfaces/ICatalystMathLibVol.sol +++ b/evm/src/registry/interfaces/ICatalystMathLibVol.sol @@ -1,5 +1,4 @@ //SPDX-License-Identifier: MIT - pragma solidity ^0.8.17; import {ERC20} from 'solmate/tokens/ERC20.sol'; diff --git a/evm/src/registry/lib/Contains.sol b/evm/src/registry/lib/Contains.sol index a006d243..66a214da 100644 --- a/evm/src/registry/lib/Contains.sol +++ b/evm/src/registry/lib/Contains.sol @@ -1,5 +1,4 @@ //SPDX-License-Identifier: MIT - pragma solidity ^0.8.19; /**