2024 10 24 deps

.gitmodules

@@ -7,3 +7,4 @@
 [submodule "lib/rain.interpreter"]
 	path = lib/rain.interpreter
 	url = https://github.com/rainlanguage/rain.interpreter
+	branch = 3.x

Cargo.toml

@@ -5,7 +5,7 @@ resolver = "2"
 
 [workspace.package]
 edition = "2021"
-license = "CAL-1.0"
+license = "LicenseRef-DCL-1.0"
 version = "0.0.0-alpha.0"
 homepage = "https://github.com/rainprotocol/rain.orderbook"
 

LICENSE

@@ -0,0 +1 @@
+LICENSES/LicenseRef-DCL-1.0.txt

README.md

@@ -1,7 +1,5 @@
 # rain.orderbook
 
-Docs at https://rainprotocol.github.io/foundry.template
-
 ## Run Tauri App for local development
 - Prepare the tauri build: `./prep-tauri.sh`
 - Copy `tauri-app/.env.example` to `tauri-ap/.env` and fill in values
@@ -22,7 +20,7 @@ deploy in the matrix.
 
 ## Generating Rust Types from Graphql
 
-**NOTICE** The crates and tauri app are currently expecting a subgraph compatible with the schema in `crates/subgraph/schema/orderbook.graphql`. 
+**NOTICE** The crates and tauri app are currently expecting a subgraph compatible with the schema in `crates/subgraph/schema/orderbook.graphql`.
 When this project is migrated to use the subgraph schema defined in `subgraph/schema/graphql`, the command below will change.
 
 1. Run the following commands to generate Rust types from GraphQL Queries
@@ -65,3 +63,47 @@ Run the following from the repo root, outside the nix shell, to generate Typescr
 ```bash
 nix run .#ob-tauri-prelude
 ```
+
+## Dev stuff
+
+### Local environment & CI
+
+Uses nixos.
+
+Install `nix develop` - https://nixos.org/download.html.
+
+Run `nix develop` in this repo to drop into the shell. Please ONLY use the nix
+version of `foundry` for development, to ensure versions are all compatible.
+
+Read the `flake.nix` file to find some additional commands included for dev and
+CI usage.
+
+## Legal stuff
+
+Everything is under DecentraLicense 1.0 (DCL-1.0) which can be found in `LICENSES/`.
+
+This is basically `CAL-1.0` which is an open source license
+https://opensource.org/license/cal-1-0
+
+The non-legal summary of DCL-1.0 is that the source is open, as expected, but
+also user data in the systems that this code runs on must also be made available
+to those users as relevant, and that private keys remain private.
+
+Roughly it's "not your keys, not your coins" aware, as close as we could get in
+legalese.
+
+This is the default situation on permissionless blockchains, so shouldn't require
+any additional effort by dev-users to adhere to the license terms.
+
+This repo is REUSE 3.2 compliant https://reuse.software/spec-3.2/ and compatible
+with `reuse` tooling (also available in the nix shell here).
+
+```
+nix develop -c rainix-sol-legal
+```
+
+## Contributions
+
+Contributions are welcome **under the same license** as above.
+
+Contributors agree and warrant that their contributions are compliant.

REUSE.toml

@@ -0,0 +1,33 @@
+version = 1
+
+[[annotations]]
+path = [
+    ".gas-snapshot",
+    ".github/workflows/**/",
+    ".gitignore",
+    ".gitmodules",
+    "README.md",
+    "flake.lock",
+    "flake.nix",
+    "foundry.toml",
+    "slither.config.json",
+    "REUSE.toml",
+    "typeshare.toml",
+    "tsconfig.json",
+    "test-js/**/",
+    "tauri-app/**/",
+    "subgraph/**/",
+    "scripts/**/",
+    "crates/**/",
+    ".eslintignore",
+    ".eslintrc.js",
+    ".vscode/**/",
+    "Cargo.lock",
+    "Cargo.toml",
+    "package-lock.json",
+    "package.json",
+    "pointers.sh",
+    "prep-tauri.sh",
+]
+SPDX-FileCopyrightText = "Copyright (c) 2020 thedavidmeister"
+SPDX-License-Identifier = "LicenseRef-DCL-1.0"

foundry.toml

@@ -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.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",
 ]

package.json

@@ -3,7 +3,7 @@
     "description": "Provides RainLanguage Orderbook rust crates' functionalities in typescript through wasm bindgen",
     "version": "0.0.1-alpha.4",
     "author": "Rain Language",
-    "license": "CAL-1.0",
+    "license": "LicenseRef-DCL-1.0",
     "repository": {
         "type": "git",
         "url": "https://github.com/rainlanguage/rain.orderbook.git"

script/BuildAuthoringMeta.sol

@@ -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";

script/BuildPointers.sol

@@ -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 {
@@ -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),

script/Deploy.sol

@@ -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";

src/abstract/OrderBookV4ArbCommon.sol

@@ -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";

src/abstract/OrderBookV4ArbOrderTaker.sol

@@ -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";

src/abstract/OrderBookV4FlashBorrower.sol

@@ -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";

src/abstract/OrderBookV4FlashLender.sol

@@ -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";

src/concrete/arb/GenericPoolOrderBookV4ArbOrderTaker.sol

@@ -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";

src/concrete/arb/GenericPoolOrderBookV4FlashBorrower.sol

@@ -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";

src/concrete/arb/RouteProcessorOrderBookV4ArbOrderTaker.sol

@@ -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";

src/concrete/ob/OrderBook.sol

@@ -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";

src/concrete/parser/OrderBookSubParser.sol

@@ -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 {

src/generated/OrderBookSubParser.pointers.sol

@@ -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.

src/lib/LibOrder.sol

@@ -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";

src/lib/LibOrderBook.sol

@@ -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 {

src/lib/LibOrderBookArb.sol

@@ -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 {TaskV1} from "rain.orderbook.interface/interface/IOrderBookV4.sol";

src/lib/LibOrderBookSubParser.sol

@@ -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 {AuthoringMetaV2, Operand} from "rain.interpreter.interface/interface/ISubParserV3.sol";

subgraph/package.json

@@ -3,7 +3,7 @@
     "description": "Subgraph setup",
     "version": "1.0.0",
     "author": "rainlanguage",
-    "license": "CAL",
+    "license": "LicenseRef-DCL-1.0",
     "scripts": {
         "test": "graph test -d"
     },

tauri-app/package.json

@@ -1,6 +1,7 @@
 {
   "name": "tauri-app",
   "version": "0.0.1",
+  "license": "LicenseRef-DCL-1.0",
   "private": true,
   "scripts": {
     "dev": "vite dev",

tauri-app/src-tauri/Cargo.toml

@@ -3,7 +3,7 @@ name = "tauri-app"
 version = "0.0.0"
 description = "raindex"
 edition = "2021"
-license = "CAL-1.0"
+license = "LicenseRef-DCL-1.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

test/abstract/OrderBookV4ArbOrderTaker.context.t.sol

@@ -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 {

test/abstract/OrderBookV4ArbOrderTaker.ierc165.t.sol

@@ -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 {Test} from "forge-std/Test.sol";

test/abstract/OrderBookV4FlashBorrower.ierc165.t.sol

@@ -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 {Test} from "forge-std/Test.sol";

test/abstract/OrderBookV4FlashLender.fee.t.sol

@@ -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 {OrderBookExternalMockTest} from "test/util/abstract/OrderBookExternalMockTest.sol";

test/abstract/OrderBookV4FlashLender.griefRecipient.t.sol

@@ -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 {OrderBookExternalMockTest} from "test/util/abstract/OrderBookExternalMockTest.sol";

test/abstract/OrderBookV4FlashLender.ierc165.t.sol

@@ -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 {Test} from "forge-std/Test.sol";