Skip to content

Commit

Permalink
Relicense to GPL (#69)
Browse files Browse the repository at this point in the history
* Relicense to GPL

* Add SPDX-License-Identifier
  • Loading branch information
tomaka authored Oct 26, 2020
1 parent 94e2687 commit ffd56de
Show file tree
Hide file tree
Showing 66 changed files with 957 additions and 1,054 deletions.
24 changes: 13 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
# Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
# SPDX-License-Identifier: Apache-2.0
# Substrate-lite
# Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
# SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
#
# 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
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# http://www.apache.org/licenses/LICENSE-2.0
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# 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.
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.

name: continuous-integration

Expand Down
24 changes: 13 additions & 11 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
# Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
# SPDX-License-Identifier: Apache-2.0
# Substrate-lite
# Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
# SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
#
# 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
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# http://www.apache.org/licenses/LICENSE-2.0
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# 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.
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.

name: deploy

Expand Down
3 changes: 1 addition & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
name = "substrate-lite"
version = "0.1.0"
authors = ["Parity Technologies <[email protected]>", "Pierre Krieger <[email protected]>"]
license = "GPL3" # TODO: at the moment some code is still straight-up copy-pasted from Substrate; need to ask on a case-by-case basis whether it's ok to relicense
# TODO: license = "Apache-2.0"
license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
edition = "2018"
keywords = ["blockchain", "peer-to-peer"]
default-run = "full-node"
Expand Down
File renamed without changes.
211 changes: 0 additions & 211 deletions LICENSE-APACHE2

This file was deleted.

6 changes: 0 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,6 @@ In order to simplify the code, two main design decisions have been made compared

- No pluggable architecture. `substrate-lite` supports a certain hardcoded list of consensus algorithms, at the moment Babe and GrandPa. Support for other algorithms can only be added by modifying the code of substrate-lite, and it is not possible to plug a custom algorithm from outside.

## Why is this repository not public?

Two concerns should be resolved before making this repository public:

- It is unclear whether this repository should be under GPL or Apache license. At the moment, all newly-written code is under Apache, but some code has been copy-pasted from Substrate and is still using the GPL.

# Objectives

There exists multiple objectives behind this repository:
Expand Down
3 changes: 1 addition & 2 deletions bin/browser-node/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
name = "substrate-lite-js"
version = "0.1.3"
authors = ["Parity Technologies <[email protected]>", "Pierre Krieger <[email protected]>"]
license = "GPL3" # TODO: at the moment some code is still straight-up copy-pasted from Substrate; need to ask on a case-by-case basis whether it's ok to relicense
# TODO: license = "Apache-2.0"
license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
edition = "2018"
publish = false

Expand Down
30 changes: 16 additions & 14 deletions bin/browser-node/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
// SPDX-License-Identifier: Apache-2.0

// 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.
// Substrate-lite
// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0

// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.

// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.

// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.

//! Contains a light client implementation usable from a browser environment, using the
//! `wasm-bindgen` library.
Expand Down
30 changes: 16 additions & 14 deletions bin/full-node/main.rs
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
// SPDX-License-Identifier: Apache-2.0

// 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.
// Substrate-lite
// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0

// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.

// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.

// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.

#![recursion_limit = "1024"]

Expand Down
Loading

0 comments on commit ffd56de

Please sign in to comment.