From 3e27726c5b11ebd193e65ac86839dbc96443379d Mon Sep 17 00:00:00 2001 From: gretzke Date: Fri, 8 Dec 2023 00:49:04 +0100 Subject: [PATCH] license update --- LICENSE-APACHE.md | 25 ------------------------- LICENSE-MIT.md | 2 -- README.md | 16 +++++++++++++++- 3 files changed, 15 insertions(+), 28 deletions(-) diff --git a/LICENSE-APACHE.md b/LICENSE-APACHE.md index 97c3519..038d25d 100644 --- a/LICENSE-APACHE.md +++ b/LICENSE-APACHE.md @@ -174,28 +174,3 @@ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION of your accepting any such warranty or additional liability. END OF TERMS AND CONDITIONS - -APPENDIX: How to apply the Apache License to your work. - -To apply the Apache License to your work, attach the following -boilerplate notice, with the fields enclosed by brackets "[]" -replaced with your own identifying information. (Don't include -the brackets!) The text should be enclosed in the appropriate -comment syntax for the file format. We also recommend that a -file or class name and description of purpose be included on the -same "printed page" as the copyright notice for easier -identification within third-party archives. - -Copyright 2023 PT Services DMCC - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. diff --git a/LICENSE-MIT.md b/LICENSE-MIT.md index 95817e3..f7f7438 100644 --- a/LICENSE-MIT.md +++ b/LICENSE-MIT.md @@ -1,7 +1,5 @@ MIT License -Copyright (c) 2023 PT Services DMCC - 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. diff --git a/README.md b/README.md index fc8ccaa..ccd4d1f 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ node lib/deployment-log-generator Deploy.s.sol --chain-id 1 --rpc-url https://ma ## Usage -Deployment markdown & json log file will be placed within the `deployments` directory. The name of the file will be the chain id of the network where the script was executed (e.g., for Ethereum mainnet the files will be `deployments/1.md` and `deployments/json/1.json`). +The deployment markdown & json log file will be placed within the `deployments` directory. The name of the file will be the chain id of the network where the script was executed (e.g., for Ethereum mainnet the files will be `deployments/1.md` and `deployments/json/1.json`). Supplying the RPC url _can_ be optional. When contracts are deployed, the RPC url is used to check whether the deployed contracts implement a `version()` function. If they do, the version is extracted and recorded within the log file. If no RPC url is supplied, the version check is skipped. @@ -39,6 +39,20 @@ Supplying the RPC url is _required_ when an upgrade is deployed for a transparen | --help | -h | Print help | | --version | -v | Print the version number | +## License + +​ +Licensed under either of +​ + +- Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0) +- MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT) + ​ + +at your option. + +Unless you explicitly state otherwise, any contribution intentionally submitted for inclusion in the work by you, as defined in the Apache-2.0 license, shall be dual licensed as above, without any additional terms or conditions. + --- © 2023 PT Services DMCC