Skip to content

Commit

Permalink
chore(license): update copyright / license (#2002)
Browse files Browse the repository at this point in the history
  • Loading branch information
ca333 authored Nov 6, 2023
1 parent 30c5869 commit c58edbc
Show file tree
Hide file tree
Showing 15 changed files with 51 additions and 52 deletions.
10 changes: 5 additions & 5 deletions LEGAL/CONTRIBUTOR-LICENSE-AGREEMENT
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Software Grant and Contributor License Agreement (CLA)

In order to clarify the intellectual property license granted with Contributions from any person or entity, we must have a Contributor License Agreement (CLA) on file that has been signed by each Contributor, indicating agreement to the license terms below. This license is for your protection as a Contributor as well as the protection of " Atomic Private Limited" (the "Company, Us and Our) users;
In order to clarify the intellectual property license granted with Contributions from any person or entity, we must have a Contributor License Agreement (CLA) on file that has been signed by each Contributor, indicating agreement to the license terms below. This license is for your protection as a Contributor as well as the protection of "Pampex LTD and TillyHK LTD" (collectively referred to as the "Companies," "Us," "Our," and "We") users;

This version of the Agreement allows Contributors to submit Contributions to us, to authorize Contributions and to grant copyright and patent licenses thereto.

Expand Down Expand Up @@ -38,7 +38,7 @@ References to "employer" in this Agreement include Your employer or anyone else

If You change employers in the future and desire to Submit additional Submissions for the new employer, then You agree to sign a new Agreement and secure permission from the new employer before Submitting those Submissions.

You agree to notify " Atomic Private Limited" in writing of any facts or circumstances of which You later become aware that would make Your representations in this Agreement inaccurate in any respect.
You agree to notify "Pampex LTD and TillyHK LTD" in writing of any facts or circumstances of which You later become aware that would make Your representations in this Agreement inaccurate in any respect.

You agree that contributions to Project and information about contributions may be maintained indefinitely and disclosed publicly, including Your name and other information that You submit with Your Submission.

Expand All @@ -50,13 +50,13 @@ Any arbitration must be commenced by filing a demand for arbitration within 6 mo

Any arbitration hearing ("Hearing") may be conducted through online means including but not limited to videoconference, upon request from either party. The Hearing will be conducted in English, and the Arbitrator may, at his or her discretion, also select a secondary language upon request by either party.

You may be required, at Company's sole discretion, to give up any and all rights you may have to seek legal action to resolve any disputes arising from these terms through any other means, including but not limited to any court of law.
You may be required, at the Companies sole discretion, to give up any and all rights you may have to seek legal action to resolve any disputes arising from these terms through any other means, including but not limited to any court of law.

The statute of limitations and any filing fee deadlines shall be tolled while the parties engage in the informal dispute resolution process required by this section.

You give up your right to participate in a class action or other class proceeding.
This Agreement is the entire agreement between the parties, and supersedes any and all prior agreements, understandings or communications, written or oral, between the parties relating to the subject matter hereof. This Agreement may be assigned by " Atomic Private Limited".
This Agreement is the entire agreement between the parties, and supersedes any and all prior agreements, understandings or communications, written or oral, between the parties relating to the subject matter hereof. This Agreement may be assigned by Pampex LTD and TillyHK LTD.

By signing, you accept and agree to the terms of this Contribution License Agreement for Your present and future Submissions to " Atomic Private Limited".
By signing, you accept and agree to the terms of this Contribution License Agreement for Your present and future Submissions to "Pampex LTD and TillyHK LTD".

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 with a limited restrictions as envisaged under the Copyright notice, 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.
35 changes: 17 additions & 18 deletions LEGAL/LICENSE-COPYRIGHT-NOTICE
Original file line number Diff line number Diff line change
@@ -1,41 +1,41 @@
Copyright © 2022 Atomic Private Limited and its contributors
Copyright © 2023 Pampex LTD and TillyHK LTD, along with its contributors.

Permission to include in application software or to make digital or hard copies of part or all of this work is subject to the following Agreement.

All software, both binary and source published by Atomic Private Limited (hereinafter, Software) is copyrighted by the Atomic Private Limited (hereinafter, "Atomic Private Limited", "Company","We" or "Us") and ownership of all right, title and interest in and to the Software remains with Atomic Private Limited. By using or copying the Software, User agrees to abide by the terms of this Agreement.
All software, both binary and source code (hereinafter, 'Software'), published under the Komodo DeFi Framework is jointly copyrighted by Pampex LTD and TillyHK LTD (collectively, 'the Companies'). Ownership of all rights, title, and interest in and to the Software remains with the Companies. By using or copying the Software, you (the 'User') agree to abide by the terms of this Agreement.

The Company grants to you (hereinafter, "User" or "You") a royalty-free, non-exclusive right to execute, copy, modify and distribute both the binary and source code solely for the uses, subject to the following conditions:
The Companies grant to you (hereinafter, 'User' or 'You') a royalty-free, non-exclusive right to execute, copy, modify, and distribute both the binary and source code, solely for the uses, subject to the following conditions:

You acknowledge that the Software is being supplied "as is," without any support services from the Company. We don't make any representations or warranties, express or implied, including, without limitation, any representations or warranties of the merchantability or fitness for any particular purpose, or that the application of the software, will not infringe on any patents or other proprietary rights of others.
You acknowledge that the Software is being supplied 'as is,' without any support services from the Companies. We don't make any representations or warranties, express or implied, including, without limitation, any representations or warranties of merchantability or fitness for any particular purpose, or that the application of the software will not infringe on any patents or other proprietary rights of others.

Company shall not be held liable for direct, indirect, incidental or consequential damages arising from any claim by User or any third party with respect to uses allowed under this Agreement, or from any use of the Software.
The Companies shall not be held liable for direct, indirect, incidental, or consequential damages arising from any claim by User or any third party with respect to uses allowed under this Agreement, or from any use of the Software.

User agrees to fully indemnify and hold harmless Company from and against any and all claims, demands, suits, losses, damages, costs and expenses arising out of the User's use of the Software, including, without limitation, arising out of the User's modification of the Software.
User agrees to fully indemnify and hold harmless the Companies from and against any and all claims, demands, suits, losses, damages, costs, and expenses arising out of the User's use of the Software, including, without limitation, arising out of the User's modification of the Software.


User may modify the Software and distribute that modified work to third parties under open-source license GPL Version 3.0 terms provided that:

(a) if posted separately, it clearly acknowledges that it contains material copyrighted by "Atomic Private Limited"
(a) if posted separately, it clearly acknowledges that it contains material copyrighted by Pampex LTD and TillyHK LTD

(b) no charge is associated with such copies,

(c) User agrees to notify "Atomic Private Limited" of the distribution.
(c) User agrees to notify Pampex LTD and TillyHK LTD of the distribution.

(d) User clearly notifies secondary users that such modified work is not the original Software.

(e) Code sections starting with a "license protected" comment and/or "Dex_Fee" code prefix and code-sections / software-logic related to these aforementioned sections shall not be modified by the Users/third parties and are subject of the copyright limitation covered under the foregoing Agreement.
(e) Code sections starting with a "license protected" comment and/or "Dex_Fee" (or "DEX_FEE" and other notations such as lower case, etc.) code prefix and code-sections / software-logic related to these aforementioned sections shall not be modified by the Users/third parties and are subject of the copyright limitation covered under the foregoing Agreement.

(f) User Agrees that he/she will not modify the following code sections and/or cryptographic keys:
https://github.com/KomodoPlatform/atomicDEX-API/blob/2fe5be95e166744667bc1fdd75fa5bb1eb5c5903/mm2src/common/common.rs#L164
https://github.com/KomodoPlatform/atomicDEX-API/blob/2fe5be95e166744667bc1fdd75fa5bb1eb5c5903/mm2src/common/common.rs#L166
https://github.com/KomodoPlatform/atomicDEX-API/blob/6a634c09198ff18a3825164d2ca1e597cd8ebb51/mm2src/coins/z_coin.rs#L97
https://github.com/KomodoPlatform/atomicDEX-API/blob/2fe5be95e166744667bc1fdd75fa5bb1eb5c5903/mm2src/lp_swap.rs#L504
https://github.com/KomodoPlatform/komodo-defi-framework/blob/2fe5be95e166744667bc1fdd75fa5bb1eb5c5903/mm2src/common/common.rs#L164
https://github.com/KomodoPlatform/komodo-defi-framework/blob/2fe5be95e166744667bc1fdd75fa5bb1eb5c5903/mm2src/common/common.rs#L166
https://github.com/KomodoPlatform/komodo-defi-framework/blob/6a634c09198ff18a3825164d2ca1e597cd8ebb51/mm2src/coins/z_coin.rs#L97
https://github.com/KomodoPlatform/komodo-defi-framework/blob/2fe5be95e166744667bc1fdd75fa5bb1eb5c5903/mm2src/lp_swap.rs#L504

User agrees that "Atomic Private Limited", the authors of the original work and others may enjoy a royalty-free, non-exclusive license to use, copy, modify and redistribute these modifications to the Software made by the User and distributed to third parties as a derivative work under this agreement.
User agrees that Pampex LTD and TillyHK LTD, the authors of the original work and others may enjoy a royalty-free, non-exclusive license to use, copy, modify and redistribute these modifications to the Software made by the User and distributed to third parties as a derivative work under this agreement.

This agreement will terminate immediately upon User's breach of, or non-compliance with, any of its terms. User may be held liable for any copyright infringement or the infringement of any other proprietary rights in the Software that is caused or facilitated by the User's failure to abide by the terms of this agreement.

This agreement will be construed and enforced in accordance with the international private laws applicable to contracts performed entirely within the designated country of the Company.
This agreement will be construed and enforced in accordance with the laws applicable to contracts performed entirely within Hong Kong, the domicile of the Companies.

Parties agree to resolve disputes in a prompt, low-cost and mutually beneficial way. Before taking legal action or requesting legal proceedings, User will personally participate in an alternative dispute resolution procedure. Mediation and/or arbitral forum will be mutually selected and parties of the alternative dispute resolution will choose the procedure.

Expand All @@ -45,14 +45,13 @@ Any arbitration must be commenced by filing a demand for arbitration within 6 mo

Any arbitration hearing ("Hearing") may be conducted through online means including but not limited to videoconference, upon request from either party. The Hearing will be conducted in English, and the Arbitrator may, at his or her discretion, also select a secondary language upon request by either party.

You may be required, at Company's sole discretion, to give up any and all rights you may have to seek legal action to resolve any disputes arising from these terms through any other means, including but not limited to any court of law.
You may be required, at Companies sole discretion, to give up any and all rights you may have to seek legal action to resolve any disputes arising from these terms through any other means, including but not limited to any court of law.

The statute of limitations and any filing fee deadlines shall be tolled while the parties engage in the informal dispute resolution process required by this section.

You give up your right to participate in a class action or other class proceeding.

This Agreement is the entire agreement between the parties, and supersedes any and all prior agreements, understandings or communications, written or oral, between the parties relating to the subject matter hereof. This Agreement may be assigned by "Atomic Private Limited" and hence you accept and agree to the terms of this Agreement.

This Agreement is the entire agreement between the User and the Companies, and supersedes any and all prior agreements, understandings, or communications, written or oral, between the User and the Companies relating to the subject matter hereof. This Agreement may be assigned by the Companies, and by accepting the terms herein, you acknowledge and consent to such assignment.
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 with a limited restrictions as envisaged under the Copyright notice, 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.

The above copyright notice/Agreement and this permission notice shall be included in all copies or substantial portions of the Software.
4 changes: 2 additions & 2 deletions examples/README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# AtomicDEX-API Examples
# Komodo DeFi Framework Examples

This directory contains example implementation/use cases of AtomicDEX-API
This directory contains example implementation/use cases of the Komodo DeFi Framework
2 changes: 1 addition & 1 deletion examples/wasm/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# AtomicDEX-API WASM example
# Komodo DeFi Framework WASM example

**wasm_build** is an example of using **MarketMaker2** in webpages
via [WebAssembly](https://developer.mozilla.org/en-US/docs/WebAssembly)
Expand Down
6 changes: 3 additions & 3 deletions mm2src/coins/eth.rs
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
/******************************************************************************
* Copyright © 2022 Atomic Private Limited and its contributors *
* Copyright © 2023 Pampex LTD and TillyHK LTD *
* *
* See the CONTRIBUTOR-LICENSE-AGREEMENT, COPYING, LICENSE-COPYRIGHT-NOTICE *
* and DEVELOPER-CERTIFICATE-OF-ORIGIN files in the LEGAL directory in *
* the top-level directory of this distribution for the individual copyright *
* holder information and the developer policies on copyright and licensing. *
* *
* Unless otherwise agreed in a custom licensing agreement, no part of the *
* AtomicDEX software, including this file may be copied, modified, propagated*
* Komodo DeFi Framework software, including this file may be copied, modified, propagated*
* or distributed except according to the terms contained in the *
* LICENSE-COPYRIGHT-NOTICE file. *
* *
Expand All @@ -18,7 +18,7 @@
// eth.rs
// marketmaker
//
// Copyright © 2022 AtomicDEX. All rights reserved.
// Copyright © 2023 Pampex LTD and TillyHK LTD. All rights reserved.
//
use super::eth::Action::{Call, Create};
use crate::lp_price::get_base_price_in_rel;
Expand Down
4 changes: 2 additions & 2 deletions mm2src/coins/lp_coins.rs
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
/******************************************************************************
* Copyright © 2022 Atomic Private Limited and its contributors *
* Copyright © 2023 Pampex LTD and TillyHK LTD *
* *
* See the CONTRIBUTOR-LICENSE-AGREEMENT, COPYING, LICENSE-COPYRIGHT-NOTICE *
* and DEVELOPER-CERTIFICATE-OF-ORIGIN files in the LEGAL directory in *
* the top-level directory of this distribution for the individual copyright *
* holder information and the developer policies on copyright and licensing. *
* *
* Unless otherwise agreed in a custom licensing agreement, no part of the *
* AtomicDEX software, including this file may be copied, modified, propagated*
* Komodo DeFi Framework software, including this file may be copied, modified, propagated*
* or distributed except according to the terms contained in the *
* LICENSE-COPYRIGHT-NOTICE file. *
* *
Expand Down
6 changes: 3 additions & 3 deletions mm2src/coins/utxo.rs
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
/******************************************************************************
* Copyright © 2022 Atomic Private Limited and its contributors *
* Copyright © 2023 Pampex LTD and TillyHK LTD *
* *
* See the CONTRIBUTOR-LICENSE-AGREEMENT, COPYING, LICENSE-COPYRIGHT-NOTICE *
* and DEVELOPER-CERTIFICATE-OF-ORIGIN files in the LEGAL directory in *
* the top-level directory of this distribution for the individual copyright *
* holder information and the developer policies on copyright and licensing. *
* *
* Unless otherwise agreed in a custom licensing agreement, no part of the *
* AtomicDEX software, including this file may be copied, modified, propagated*
* Komodo DeFi Framework software, including this file may be copied, modified, propagated*
* or distributed except according to the terms contained in the *
* LICENSE-COPYRIGHT-NOTICE file. *
* *
Expand All @@ -18,7 +18,7 @@
// utxo.rs
// marketmaker
//
// Copyright © 2022 AtomicDEX. All rights reserved.
// Copyright © 2023 Pampex LTD and TillyHK LTD. All rights reserved.
//

pub mod bch;
Expand Down
4 changes: 2 additions & 2 deletions mm2src/crypto/src/privkey.rs
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
/******************************************************************************
* Copyright © 2022 Atomic Private Limited and its contributors *
* Copyright © 2023 Pampex LTD and TillyHK LTD *
* *
* See the CONTRIBUTOR-LICENSE-AGREEMENT, COPYING, LICENSE-COPYRIGHT-NOTICE *
* and DEVELOPER-CERTIFICATE-OF-ORIGIN files in the LEGAL directory in *
* the top-level directory of this distribution for the individual copyright *
* holder information and the developer policies on copyright and licensing. *
* *
* Unless otherwise agreed in a custom licensing agreement, no part of the *
* AtomicDEX software, including this file may be copied, modified, propagated*
* Komodo DeFi Framework software, including this file may be copied, modified, propagated*
* or distributed except according to the terms contained in the *
* LICENSE-COPYRIGHT-NOTICE file. *
* *
Expand Down
Loading

0 comments on commit c58edbc

Please sign in to comment.