Skip to content

Commit

Permalink
Merge pull request #1033 from rainlanguage/2024-11-29-license
Browse files Browse the repository at this point in the history
rainix legal check
  • Loading branch information
thedavidmeister authored Nov 29, 2024
2 parents fdc009b + e5c9784 commit 3ded605
Show file tree
Hide file tree
Showing 127 changed files with 468 additions and 134 deletions.
12 changes: 0 additions & 12 deletions .devcontainer.json

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/rainix.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macos-latest]
task: [ob-rs-test, rainix-rs-artifacts]
task: [ob-rs-test, rainix-rs-artifacts, rainix-sol-legal]
include:
# Solidity doesn't need to be tested on multiple platforms
- os: ubuntu-latest
Expand Down
7 changes: 4 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
[submodule "lib/sushixswap-v2"]
path = lib/sushixswap-v2
url = https://github.com/rainprotocol/sushixswap-v2
[submodule "lib/rain.orderbook.interface"]
path = lib/rain.orderbook.interface
url = https://github.com/rainlanguage/rain.orderbook.interface
[submodule "lib/rain.interpreter"]
path = lib/rain.interpreter
url = https://github.com/rainlanguage/rain.interpreter
branch = 3.x
[submodule "lib/rain.orderbook.interface"]
path = lib/rain.orderbook.interface
url = https://github.com/rainlanguage/rain.orderbook.interface
3 changes: 2 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ resolver = "2"

[workspace.package]
edition = "2021"
license = "CAL-1.0"
license = "LicenseRef-DCL-1.0"
author = "Rain Open Source LLC"
version = "0.0.0-alpha.0"
homepage = "https://github.com/rainprotocol/rain.orderbook"

Expand Down
1 change: 1 addition & 0 deletions LICENSE
189 changes: 189 additions & 0 deletions LICENSES/LicenseRef-DCL-1.0.txt

Large diffs are not rendered by default.

35 changes: 35 additions & 0 deletions REUSE.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
version = 1

[[annotations]]
path = [
".gas-snapshot",
".github/workflows/**/",
".gitignore",
".gitmodules",
".vscode/**/",
"README.md",
"flake.lock",
"flake.nix",
"foundry.toml",
"slither.config.json",
"typeshare.toml",
"REUSE.toml",
"pointers.sh",
"prep-tauri.sh",
"package.json",
"package-lock.json",
"Cargo.lock",
"Cargo.toml",
]
SPDX-FileCopyrightText = "Copyright (c) 2020 thedavidmeister"
SPDX-License-Identifier = "LicenseRef-DCL-1.0"

[[annotations]]
path = [
"packages/**/",
"subgraph/**/",
"crates/**/",
"tauri-app/**/",
]
SPDX-FileCopyrightText = "Copyright (c) 2020 Rain Open Source LLC"
SPDX-License-Identifier = "LicenseRef-DCL-1.0"
1 change: 1 addition & 0 deletions crates/bindings/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ description = "Bindings for the Rain Orderbook Solidity contracts to Rust types.
version.workspace = true
edition.workspace = true
license.workspace = true
author.workspace = true
homepage.workspace = true

[dependencies]
Expand Down
1 change: 1 addition & 0 deletions crates/cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ description = "Rain Orderbook CLI."
version.workspace = true
edition.workspace = true
license.workspace = true
author.workspace = true
homepage.workspace = true

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
Expand Down
1 change: 1 addition & 0 deletions crates/common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ description = "Rain Orderbook CLI."
version.workspace = true
edition.workspace = true
license.workspace = true
author.workspace = true
homepage.workspace = true

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
Expand Down
1 change: 1 addition & 0 deletions crates/integration_tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ name = "rain_orderbook_integration_tests"
version.workspace = true
edition.workspace = true
license.workspace = true
author.workspace = true
homepage.workspace = true
publish = false

Expand Down
1 change: 1 addition & 0 deletions crates/js_api/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ description = "Javascript bindings for common functions accross the app."
version.workspace = true
edition.workspace = true
license.workspace = true
author.workspace = true
homepage.workspace = true
publish = false

Expand Down
1 change: 1 addition & 0 deletions crates/math/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ description = "Math toolings for Rain Orderbooks crates"
version.workspace = true
edition.workspace = true
license.workspace = true
author.workspace = true
homepage.workspace = true

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
Expand Down
2 changes: 1 addition & 1 deletion crates/quote/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ description = "Quote Rain Orderbook Orders"
version.workspace = true
edition.workspace = true
license.workspace = true
author.workspace = true
homepage.workspace = true


# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[lib]
Expand Down
1 change: 1 addition & 0 deletions crates/settings/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ description = "Rain Orderbook app settings parsing & validation"
version.workspace = true
edition.workspace = true
license.workspace = true
author.workspace = true
homepage.workspace = true

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
Expand Down
1 change: 1 addition & 0 deletions crates/subgraph/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ description = "Subgraph client, queries & schemas for the Rain Orderbook"
version.workspace = true
edition.workspace = true
license.workspace = true
author.workspace = true
homepage.workspace = true

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
Expand Down
1 change: 1 addition & 0 deletions crates/test_fixtures/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ name = "rain_orderbook_test_fixtures"
version.workspace = true
edition.workspace = true
license.workspace = true
author.workspace = true
homepage.workspace = true
publish = false

Expand Down
12 changes: 6 additions & 6 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion foundry.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ remappings = [
"rain.interpreter/=lib/rain.interpreter/src/",
"rain.metadata/=lib/rain.interpreter/lib/rain.metadata/src/",
"rain.interpreter.interface/=lib/rain.orderbook.interface/lib/rain.interpreter.interface/src/",
"rain.intorastring/=lib/rain.interpreter/lib/rain.intorastring/",
"rain.intorastring/=lib/rain.interpreter/lib/rain.interpreter.interface/lib/rain.intorastring/src/",
"rain.sol.codegen/=lib/rain.interpreter/lib/rain.sol.codegen/src/",
"rain.solmem/=lib/rain.orderbook.interface/lib/rain.interpreter.interface/lib/rain.solmem/src",
]
Expand Down
2 changes: 1 addition & 1 deletion lib/rain.interpreter
Submodule rain.interpreter updated 306 files
5 changes: 4 additions & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions packages/orderbook/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"name": "@rainlanguage/orderbook",
"description": "Provides RainLanguage Orderbook rust crates' functionalities in typescript through wasm bindgen",
"version": "0.0.1-alpha.5",
"author": "Rain Language",
"license": "CAL-1.0",
"license": "LicenseRef-DCL-1.0",
"author": "Rain Open Source LLC",
"repository": {
"type": "git",
"url": "https://github.com/rainlanguage/rain.orderbook.git"
Expand Down
2 changes: 2 additions & 0 deletions packages/ui-components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
"name": "@rainlanguage/ui-components",
"version": "0.0.1",
"description": "A component library for building Svelte applications to be used with Raindex.",
"license": "LicenseRef-DCL-1.0",
"author": "Rain Open Source LLC",
"main": "dist/index.js",
"module": "dist/index.js",
"exports": {
Expand Down
2 changes: 2 additions & 0 deletions packages/webapp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
"name": "@rainlanguage/webapp",
"version": "0.0.1",
"type": "module",
"license": "LicenseRef-DCL-1.0",
"author": "Rain Open Source LLC",
"scripts": {
"dev": "vite dev",
"build": "vite build",
Expand Down
3 changes: 2 additions & 1 deletion script/BuildAuthoringMeta.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// SPDX-License-Identifier: CAL
// SPDX-License-Identifier: LicenseRef-DCL-1.0
// SPDX-FileCopyrightText: Copyright (c) 2020 thedavidmeister
pragma solidity =0.8.25;

import {Script} from "forge-std/Script.sol";
Expand Down
6 changes: 4 additions & 2 deletions script/BuildPointers.sol
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
// SPDX-License-Identifier: CAL
// SPDX-License-Identifier: LicenseRef-DCL-1.0
// SPDX-FileCopyrightText: Copyright (c) 2020 thedavidmeister
pragma solidity =0.8.25;

import {Script} from "forge-std/Script.sol";
import {LibCodeGen} from "rain.sol.codegen/lib/LibCodeGen.sol";
import {LibFs} from "rain.sol.codegen/lib/LibFs.sol";
import {OrderBookSubParser} from "src/concrete/parser/OrderBookSubParser.sol";
import {LibOrderBookSubParser, EXTERN_PARSE_META_BUILD_DEPTH} from "src/lib/LibOrderBookSubParser.sol";
import {LibGenParseMeta} from "rain.interpreter.interface/lib/codegen/LibGenParseMeta.sol";

contract BuildPointers is Script {
function buildOrderBookSubParserPointers() internal {
Expand All @@ -19,7 +21,7 @@ contract BuildPointers is Script {
name,
string.concat(
LibCodeGen.describedByMetaHashConstantString(vm, name),
LibCodeGen.parseMetaConstantString(
LibGenParseMeta.parseMetaConstantString(
vm, LibOrderBookSubParser.authoringMetaV2(), EXTERN_PARSE_META_BUILD_DEPTH
),
LibCodeGen.subParserWordParsersConstantString(vm, subParser),
Expand Down
3 changes: 2 additions & 1 deletion script/Deploy.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// SPDX-License-Identifier: CAL
// SPDX-License-Identifier: LicenseRef-DCL-1.0
// SPDX-FileCopyrightText: Copyright (c) 2020 thedavidmeister
pragma solidity =0.8.25;

import {Script} from "forge-std/Script.sol";
Expand Down
3 changes: 2 additions & 1 deletion src/abstract/OrderBookV4ArbCommon.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// SPDX-License-Identifier: CAL
// SPDX-License-Identifier: LicenseRef-DCL-1.0
// SPDX-FileCopyrightText: Copyright (c) 2020 thedavidmeister
pragma solidity ^0.8.19;

import {EvaluableV3, SignedContextV1} from "rain.interpreter.interface/interface/IInterpreterCallerV3.sol";
Expand Down
3 changes: 2 additions & 1 deletion src/abstract/OrderBookV4ArbOrderTaker.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// SPDX-License-Identifier: CAL
// SPDX-License-Identifier: LicenseRef-DCL-1.0
// SPDX-FileCopyrightText: Copyright (c) 2020 thedavidmeister
pragma solidity ^0.8.19;

import {ERC165, IERC165} from "openzeppelin-contracts/contracts/utils/introspection/ERC165.sol";
Expand Down
3 changes: 2 additions & 1 deletion src/abstract/OrderBookV4FlashBorrower.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// SPDX-License-Identifier: CAL
// SPDX-License-Identifier: LicenseRef-DCL-1.0
// SPDX-FileCopyrightText: Copyright (c) 2020 thedavidmeister
pragma solidity ^0.8.19;

import {ERC165, IERC165} from "openzeppelin-contracts/contracts/utils/introspection/ERC165.sol";
Expand Down
3 changes: 2 additions & 1 deletion src/abstract/OrderBookV4FlashLender.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// SPDX-License-Identifier: CAL
// SPDX-License-Identifier: LicenseRef-DCL-1.0
// SPDX-FileCopyrightText: Copyright (c) 2020 thedavidmeister
pragma solidity ^0.8.19;

import {ERC165, IERC165} from "openzeppelin-contracts/contracts/utils/introspection/ERC165.sol";
Expand Down
3 changes: 2 additions & 1 deletion src/concrete/arb/GenericPoolOrderBookV4ArbOrderTaker.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// SPDX-License-Identifier: CAL
// SPDX-License-Identifier: LicenseRef-DCL-1.0
// SPDX-FileCopyrightText: Copyright (c) 2020 thedavidmeister
pragma solidity =0.8.25;

import {IERC20} from "openzeppelin-contracts/contracts/token/ERC20/IERC20.sol";
Expand Down
3 changes: 2 additions & 1 deletion src/concrete/arb/GenericPoolOrderBookV4FlashBorrower.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// SPDX-License-Identifier: CAL
// SPDX-License-Identifier: LicenseRef-DCL-1.0
// SPDX-FileCopyrightText: Copyright (c) 2020 thedavidmeister
pragma solidity =0.8.25;

import {IERC3156FlashLender} from "rain.orderbook.interface/interface/ierc3156/IERC3156FlashLender.sol";
Expand Down
3 changes: 2 additions & 1 deletion src/concrete/arb/RouteProcessorOrderBookV4ArbOrderTaker.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// SPDX-License-Identifier: CAL
// SPDX-License-Identifier: LicenseRef-DCL-1.0
// SPDX-FileCopyrightText: Copyright (c) 2020 thedavidmeister
pragma solidity =0.8.25;

import {IRouteProcessor} from "sushixswap-v2/src/interfaces/IRouteProcessor.sol";
Expand Down
3 changes: 2 additions & 1 deletion src/concrete/ob/OrderBook.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// SPDX-License-Identifier: CAL
// SPDX-License-Identifier: LicenseRef-DCL-1.0
// SPDX-FileCopyrightText: Copyright (c) 2020 thedavidmeister
pragma solidity =0.8.25;

import {Math} from "openzeppelin-contracts/contracts/utils/math/Math.sol";
Expand Down
3 changes: 2 additions & 1 deletion src/concrete/parser/OrderBookSubParser.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// SPDX-License-Identifier: CAL
// SPDX-License-Identifier: LicenseRef-DCL-1.0
// SPDX-FileCopyrightText: Copyright (c) 2020 thedavidmeister
pragma solidity =0.8.25;

import {
Expand Down
3 changes: 2 additions & 1 deletion src/generated/OrderBookSubParser.pointers.sol
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
// needs the pointers file to exist so that it can compile, and the pointers
// file needs the contract to exist so that it can be compiled.

// SPDX-License-Identifier: CAL
// SPDX-License-Identifier: LicenseRef-DCL-1.0
// SPDX-FileCopyrightText: Copyright (c) 2020 thedavidmeister
pragma solidity =0.8.25;

/// @dev Hash of the known bytecode.
Expand Down
3 changes: 2 additions & 1 deletion src/lib/LibOrder.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// SPDX-License-Identifier: CAL
// SPDX-License-Identifier: LicenseRef-DCL-1.0
// SPDX-FileCopyrightText: Copyright (c) 2020 thedavidmeister
pragma solidity ^0.8.18;

import {OrderV3} from "rain.orderbook.interface/interface/IOrderBookV4.sol";
Expand Down
3 changes: 2 additions & 1 deletion src/lib/LibOrderBook.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// SPDX-License-Identifier: CAL
// SPDX-License-Identifier: LicenseRef-DCL-1.0
// SPDX-FileCopyrightText: Copyright (c) 2020 thedavidmeister
pragma solidity ^0.8.19;

import {
Expand Down
Loading

0 comments on commit 3ded605

Please sign in to comment.