From af3e4dae69c175bb8e7c8b368bf18bcdfb10bc64 Mon Sep 17 00:00:00 2001 From: Shogo Hyodo Date: Mon, 22 Jan 2024 14:47:35 +0900 Subject: [PATCH 1/6] Modify license --- contracts/minimal/LICENSE => LICENSE | 0 contracts/minimal/NOTICE => NOTICE | 0 contracts/cw20/NOTICE | 14 ++++++++++++++ contracts/cw721/NOTICE | 2 +- 4 files changed, 15 insertions(+), 1 deletion(-) rename contracts/minimal/LICENSE => LICENSE (100%) rename contracts/minimal/NOTICE => NOTICE (100%) create mode 100644 contracts/cw20/NOTICE diff --git a/contracts/minimal/LICENSE b/LICENSE similarity index 100% rename from contracts/minimal/LICENSE rename to LICENSE diff --git a/contracts/minimal/NOTICE b/NOTICE similarity index 100% rename from contracts/minimal/NOTICE rename to NOTICE diff --git a/contracts/cw20/NOTICE b/contracts/cw20/NOTICE new file mode 100644 index 0000000..71d043a --- /dev/null +++ b/contracts/cw20/NOTICE @@ -0,0 +1,14 @@ +cw20 +Copyright 2021,2022 Confio GmbH + +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/contracts/cw721/NOTICE b/contracts/cw721/NOTICE index 7c303ab..a8182ca 100644 --- a/contracts/cw721/NOTICE +++ b/contracts/cw721/NOTICE @@ -1,4 +1,4 @@ -Cw721_base +cw721 Copyright (C) 2020-2021 Confio OÜ Licensed under the Apache License, Version 2.0 (the "License"); From 6058b25a65da72820bc6300d2f07a0b3d5213fc0 Mon Sep 17 00:00:00 2001 From: Shogo Hyodo Date: Mon, 29 Jan 2024 18:25:01 +0900 Subject: [PATCH 2/6] Add notice when using cw-gitpod --- README.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 6579793..01ec2b4 100644 --- a/README.md +++ b/README.md @@ -2,13 +2,15 @@ This is a workspace to develop CosmWasm contracts for Finschia. -## How To Use +## Requirements -Install [cargo-generate](https://github.com/ashleygwilliams/cargo-generate). +- [cargo-generate](https://github.com/ashleygwilliams/cargo-generate) +- rust v1.69.0 -``` -cargo install cargo-generate -``` +> [!NOTE] +> If you use the cw-gitpod environment, these tools are already installed. + +## How To Use Generate a workspace using a following command. From 8308dfd78688cacf1b7f5e1857b672fc4e0b9c59 Mon Sep 17 00:00:00 2001 From: Shogo Hyodo Date: Thu, 15 Feb 2024 14:39:36 +0900 Subject: [PATCH 3/6] Fix copyright --- NOTICE | 1 + contracts/cw20/NOTICE | 1 + contracts/cw721/NOTICE | 1 + contracts/minimal/NOTICE | 15 +++++++++++++++ 4 files changed, 18 insertions(+) create mode 100644 contracts/minimal/NOTICE diff --git a/NOTICE b/NOTICE index 216c969..3cdfda0 100644 --- a/NOTICE +++ b/NOTICE @@ -1,3 +1,4 @@ +Copyright 2024 Finschia Foundation Copyright {{ "now" | date: "%Y" }} {{authors}} Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/contracts/cw20/NOTICE b/contracts/cw20/NOTICE index 71d043a..6a11986 100644 --- a/contracts/cw20/NOTICE +++ b/contracts/cw20/NOTICE @@ -1,5 +1,6 @@ cw20 Copyright 2021,2022 Confio GmbH +Copyright 2023 Finschia Foundation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/contracts/cw721/NOTICE b/contracts/cw721/NOTICE index a8182ca..e57aeb7 100644 --- a/contracts/cw721/NOTICE +++ b/contracts/cw721/NOTICE @@ -1,5 +1,6 @@ cw721 Copyright (C) 2020-2021 Confio OÜ +Copyright 2023 Finschia Foundation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/contracts/minimal/NOTICE b/contracts/minimal/NOTICE new file mode 100644 index 0000000..84e66ad --- /dev/null +++ b/contracts/minimal/NOTICE @@ -0,0 +1,15 @@ +minimal +Copyright 2019 Osmosis Foundation Ltd. +Copyright 2024 Finschia Foundation + +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. From aea0d6ffca7eda54867c3a10ccef2b44880db2dc Mon Sep 17 00:00:00 2001 From: Shogo Hyodo Date: Thu, 15 Feb 2024 14:41:41 +0900 Subject: [PATCH 4/6] Fix copyright --- contracts/cw20/NOTICE | 2 +- contracts/cw721/NOTICE | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contracts/cw20/NOTICE b/contracts/cw20/NOTICE index 6a11986..34b7656 100644 --- a/contracts/cw20/NOTICE +++ b/contracts/cw20/NOTICE @@ -1,6 +1,6 @@ cw20 Copyright 2021,2022 Confio GmbH -Copyright 2023 Finschia Foundation +Copyright 2024 Finschia Foundation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/contracts/cw721/NOTICE b/contracts/cw721/NOTICE index e57aeb7..4fd3db1 100644 --- a/contracts/cw721/NOTICE +++ b/contracts/cw721/NOTICE @@ -1,6 +1,6 @@ cw721 Copyright (C) 2020-2021 Confio OÜ -Copyright 2023 Finschia Foundation +Copyright 2024 Finschia Foundation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. From 010eafdc38cf92c9f3e901bb1c06c52cb1d5c53f Mon Sep 17 00:00:00 2001 From: Shogo Hyodo Date: Thu, 22 Feb 2024 15:04:13 +0900 Subject: [PATCH 5/6] Update NOTICE --- NOTICE | 16 +++++++++++++++- contracts/cw20/NOTICE | 16 +++++++++++++++- contracts/cw721/NOTICE | 16 +++++++++++++++- contracts/minimal/NOTICE | 16 +++++++++++++++- 4 files changed, 60 insertions(+), 4 deletions(-) diff --git a/NOTICE b/NOTICE index 3cdfda0..8c00fa8 100644 --- a/NOTICE +++ b/NOTICE @@ -1,4 +1,3 @@ -Copyright 2024 Finschia Foundation Copyright {{ "now" | date: "%Y" }} {{authors}} Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,3 +11,18 @@ 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. +-------------------------------------------------------------------- + +Copyright 2024 Finschia Foundation + +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. \ No newline at end of file diff --git a/contracts/cw20/NOTICE b/contracts/cw20/NOTICE index 34b7656..321bf84 100644 --- a/contracts/cw20/NOTICE +++ b/contracts/cw20/NOTICE @@ -1,5 +1,4 @@ cw20 -Copyright 2021,2022 Confio GmbH Copyright 2024 Finschia Foundation Licensed under the Apache License, Version 2.0 (the "License"); @@ -13,3 +12,18 @@ 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. +-------------------------------------------------------------------- + +Copyright 2021,2022 Confio GmbH + +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. \ No newline at end of file diff --git a/contracts/cw721/NOTICE b/contracts/cw721/NOTICE index 4fd3db1..04e1c63 100644 --- a/contracts/cw721/NOTICE +++ b/contracts/cw721/NOTICE @@ -1,5 +1,4 @@ cw721 -Copyright (C) 2020-2021 Confio OÜ Copyright 2024 Finschia Foundation Licensed under the Apache License, Version 2.0 (the "License"); @@ -13,3 +12,18 @@ 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. +-------------------------------------------------------------------- + +Copyright (C) 2020-2021 Confio OÜ + +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. \ No newline at end of file diff --git a/contracts/minimal/NOTICE b/contracts/minimal/NOTICE index 84e66ad..4cebd7f 100644 --- a/contracts/minimal/NOTICE +++ b/contracts/minimal/NOTICE @@ -1,5 +1,4 @@ minimal -Copyright 2019 Osmosis Foundation Ltd. Copyright 2024 Finschia Foundation Licensed under the Apache License, Version 2.0 (the "License"); @@ -13,3 +12,18 @@ 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. +-------------------------------------------------------------------- + +Copyright 2019 Osmosis Foundation Ltd. + +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. \ No newline at end of file From b1abedad24c254f439e301dd6a986ffad342b7ec Mon Sep 17 00:00:00 2001 From: Shogo Hyodo Date: Thu, 22 Feb 2024 15:04:58 +0900 Subject: [PATCH 6/6] Update NOTICE --- NOTICE | 2 +- contracts/cw20/NOTICE | 2 +- contracts/cw721/NOTICE | 2 +- contracts/minimal/NOTICE | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/NOTICE b/NOTICE index 8c00fa8..01acb1c 100644 --- a/NOTICE +++ b/NOTICE @@ -25,4 +25,4 @@ 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. \ No newline at end of file +limitations under the License. diff --git a/contracts/cw20/NOTICE b/contracts/cw20/NOTICE index 321bf84..b95b856 100644 --- a/contracts/cw20/NOTICE +++ b/contracts/cw20/NOTICE @@ -26,4 +26,4 @@ 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. \ No newline at end of file +limitations under the License. diff --git a/contracts/cw721/NOTICE b/contracts/cw721/NOTICE index 04e1c63..1f0d9f9 100644 --- a/contracts/cw721/NOTICE +++ b/contracts/cw721/NOTICE @@ -26,4 +26,4 @@ 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. \ No newline at end of file +limitations under the License. diff --git a/contracts/minimal/NOTICE b/contracts/minimal/NOTICE index 4cebd7f..1dac82f 100644 --- a/contracts/minimal/NOTICE +++ b/contracts/minimal/NOTICE @@ -26,4 +26,4 @@ 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. \ No newline at end of file +limitations under the License.