diff --git a/.devcontainer.json b/.devcontainer.json deleted file mode 100644 index 272e49571..000000000 --- a/.devcontainer.json +++ /dev/null @@ -1,12 +0,0 @@ -{ -"image": "rainprotocol/devcontainer:foundry", -"customizations": { - "vscode": { - "extensions": [ - "JuanBlanco.solidity", - "ms-azuretools.vscode-docker", - "bungcip.better-toml" - ] - } -} -} diff --git a/.gitmodules b/.gitmodules index 06a43b165..0deef080f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,3 +7,4 @@ [submodule "lib/rain.interpreter"] path = lib/rain.interpreter url = https://github.com/rainlanguage/rain.interpreter + branch = 3.x diff --git a/Cargo.toml b/Cargo.toml index 364e435cc..fe00deff8 100644 --- a/Cargo.toml +++ b/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" diff --git a/LICENSE b/LICENSE new file mode 120000 index 000000000..cba180ca2 --- /dev/null +++ b/LICENSE @@ -0,0 +1 @@ +LICENSES/LicenseRef-DCL-1.0.txt \ No newline at end of file diff --git a/LICENSES/LicenseRef-DCL-1.0.txt b/LICENSES/LicenseRef-DCL-1.0.txt new file mode 100644 index 000000000..dc4e17161 --- /dev/null +++ b/LICENSES/LicenseRef-DCL-1.0.txt @@ -0,0 +1,189 @@ +# DecentraLicense + +*This DecentraLicense (the “License”) applies to any Work whose owner has marked it with any of the following notices:* + +*“Licensed under the DecentraLicense version 1.0,” or* + +*“Licensed under the DecentraLicense version 1.0, with Combined Work Exception”* + +------ + +## 1. Purpose + +This License gives You unlimited permission to use and modify the software to which it applies (the “Work”), either as-is or in modified form, for Your private purposes, while protecting the owners and contributors to the software from liability. + +This License also strives to protect the freedom and autonomy of third parties who receive the Work from you. If any non-affiliated third party receives any part, aspect, or element of the Work from You, this License requires that You provide that third party all the permissions and materials needed to independently use and modify the Work without that third party having a loss of data or capability due to your actions. + +The full permissions, conditions, and other terms are laid out below. + +## 2. Receiving a License + +In order to receive this License, You must agree to its rules. The rules of this License are both obligations of Your agreement with the Licensor and conditions to your License. You must not do anything with the Work that triggers a rule You cannot or will not follow. + +### 2.1. Application + +The terms of this License apply to the Work as you receive it from Licensor, as well as to any modifications, elaborations, or implementations created by You that contain any licenseable portion of the Work (a “Modified Work”). Unless specified, any reference to the Work also applies to a Modified Work. + +### 2.2. Offer and Acceptance + +This License is automatically offered to every person and organization. You show that you accept this License and agree to its conditions by taking any action with the Work that, absent this License, would infringe any intellectual property right held by Licensor. + +### 2.3. Compliance and Remedies + +Any failure to act according to the terms and conditions of this License places Your use of the Work outside the scope of the License and infringes the rights of the Licensor. In the event of breach, the terms and conditions of this License may be enforced by Licensor under the laws of any jurisdiction to which You are subject. You also agree that either the Licensor or a Recipient (as an intended third-party beneficiary) may enforce the terms and conditions of this License against You via specific performance. + +To the fullest extent available under the law of any jurisdiction to which You are subject, You also agree that a Recipient (as an intended third-party beneficiary) receives a benefit in the form of the ability to maintain exclusive control of private keys under the terms and conditions of this License. + +## 3. Permissions and Conditions + +### 3.1. Permissions Granted + +Conditioned on compliance with section 4, and subject to the limitations of section 3.2, Licensor grants You the world-wide, royalty-free, non-exclusive permission to: + +> a) Take any action with the Work that would infringe the non-patent intellectual property laws of any jurisdiction to which You are subject; and +> +> b) Take any action with the Work that would infringe any patent claims that Licensor can license or becomes able to license, to the extent that those claims are embodied in the Work as distributed by Licensor. + +### 3.2. Limitations on Permissions Granted + +The following limitations apply to the permissions granted in section 3.1: + +> a) Licensor does not grant any patent license for claims that are only infringed due to modification of the Work as provided by Licensor, or the combination of the Work as provided by Licensor, directly or indirectly, with any other component, including other software or hardware. +> +> b) Licensor does not grant any license to the trademarks, service marks, or logos of Licensor, except to the extent necessary to comply with the attribution conditions in section 4.1 of this License. + +## 4. Conditions + +If You exercise any permission granted by this License, such that the Work, or any part, aspect, or element of the Work, is distributed, communicated, made available, or made perceptible to a non-Affiliate third party (a “Recipient”), either via physical delivery or via a network connection to the Recipient, You must comply with the following conditions: + +### 4.1. Provide Access to Source Code + +Subject to the exception in section 4.4, You must provide to each Recipient a copy of, or no-charge unrestricted network access to, the Source Code corresponding to the Work. + +The “Source Code” of the Work means the form of the Work preferred for making modifications, including any comments, configuration information, documentation, help materials, installation instructions, cryptographic seeds or keys, and any information reasonably necessary for the Recipient to independently compile and use the Source Code and to have full access to the functionality contained in the Work. + +#### 4.1.1. Providing Network Access to the Source Code + +Network access to the Notices and Source Code may be provided by You or by a third party, such as a public software repository, and must persist during the same period in which You exercise any of the permissions granted to You under this License and for at least one year thereafter. + +#### 4.1.2. Source Code for a Modified Work + +Subject to the exception in section 4.5, You must provide to each Recipient of a Modified Work Access to Source Code corresponding to those portions of the Work remaining in the Modified Work as well as the modifications used by You to create the Modified Work. The Source Code corresponding to the modifications in the Modified Work must be provided to the Recipient either a) under this License, or b) under a Compatible Open Source License. + +A “Compatible Open Source License” means a license accepted by the Open Source Initiative that allows object code created using both Source Code provided under this License and Source Code provided under the other open source license to be distributed together as a single work. + +#### 4.1.3. Coordinated Disclosure of Security Vulnerabilities + +You may delay providing the Source Code corresponding to a particular modification of the Work for up to ninety (90) days (the “Embargo Period”) if: a) the modification is intended to address a newly-identified vulnerability or a security flaw in the Work, b) disclosure of the vulnerability or security flaw before the end of the Embargo Period would put the data, identity, or autonomy of one or more Recipients of the Work at significant risk, c) You are participating in a coordinated disclosure of the vulnerability or security flaw with one or more additional Licensees, and d) Access to the Source Code pertaining to the modification is provided to all Recipients at the end of the Embargo Period. + +### 4.2. Maintain User Autonomy + +In addition to providing each Recipient the opportunity to have Access to the Source Code, You cannot use the permissions given under this License to interfere with a Recipient’s ability to fully use an independent copy of the Work generated from the Source Code You provide with the Recipient’s own User Data. + +“User Data” means any data that is an input to or an output from the Work, where the presence of the data is necessary for substantially identical use of the Work in an equivalent context chosen by the Recipient, and where the Recipient has an existing ownership interest, an existing right to possess, or where the data has been generated by, for, or has been assigned to the Recipient. + +#### 4.2.1. No Withholding User Data + +Throughout any period in which You exercise any of the permissions granted to You under this License, You must also provide to any Recipient to whom you provide services via the Work, a no-charge copy, provided in a commonly used electronic form, of the Recipient’s User Data in your possession, to the extent that such User Data is available to You for use in conjunction with the Work. + +#### 4.2.2. No Technical Measures that Limit Access + +You may not, by the use of cryptographic methods applied to anything provided to the Recipient, by possession or control of cryptographic keys, seeds, or hashes, by other technological protection measures, or by any other method, limit a Recipient's ability to access any functionality present in the Recipient's independent copy of the Work, or deny a Recipient full control of the Recipient's User Data. + +#### 4.2.3. No Legal or Contractual Measures that Limit Access + +You may not contractually restrict a Recipient's ability to independently exercise the permissions granted under this License. You waive any legal power to forbid circumvention of technical protection measures that include use of the Work, and You waive any claim that the capabilities of the Work were limited or modified as a means of enforcing the legal rights of third parties against Recipients. + +### 4.3. Decentralized Code and Decentralized Systems + +You must only run Decentralized Code if: + +> a) it is run by a Decentralized System; and +> +> b) all the data referenced by Decentralized Code is stored on a Decentralized System. + +“Decentralized Code” is a Source Code file marked by the Licensor as “Decentralized Code”. + +“Decentralized System” is a system operating solely in accordance with publicly available Rules where any person or organisation: + +> a) only participates in the system by freely opting in; +> +> b) can interpret system data by reference to the Rules; and +> +> c) can obtain a copy of the system data, provided in a commonly used electronic form, accessible in accordance with the Rules. + +“Rule” is any unambiguous and human comprehensible: + +> a) rule that results in a deterministic outcome when implemented, in a commonly used electronic form; or +> +> b) configuration information, documentation, help materials, and any information reasonably necessary for a Recipient skilled in the art to independently comprehend the rule. + +### 4.4. Maintain Private Key Exclusive Control + +You cannot use the permissions given under this License to provide a Recipient with functionality using the Work that: + +> a) would cause the loss of exclusive control of a private key by a private key holder with exclusive control of a private key; or +> +> b) deals with private keys except by using a Decentralized System. + +### 4.5. Provide Notices and Attribution + +You must retain all licensing, authorship, or attribution notices contained in the Source Code (the “Notices”), and provide all such Notices to each Recipient, together with a statement acknowledging the use of the Work. Notices may be provided directly to a Recipient or via an easy-to-find hyperlink to an Internet location also providing Access to Source Code. + +### 4.6. Scope of Conditions in this License + +You are required to uphold the conditions of this License only relative to those who are Recipients of the Work from You. Other than providing Recipients with the applicable Notices, Access to Source Code, and a copy of and full control of their User Data, nothing in this License requires You to provide processing services to or engage in network interactions with anyone. + +### 4.7. Combined Work Exception + +As an exception to condition that You provide Recipients Access to Source Code, any Source Code files not marked by the Licensor as “Decentralized Code” and as having the “Combined Work Exception,” or any object code exclusively resulting from Source Code files so marked, may be combined with other Software into a “Larger Work.” So long as you: a) comply with the requirements to provide Recipients the applicable Notices and Access to the Source Code provided to You by Licensor, b) you provide Recipients access to their User Data and do not limit Recipient’s ability to independently work with their User Data, c) you comply with the requirements in relation to Decentralized Code and Decentralized Systems, and d) Recipients are able to maintain exclusive control of private cryptographic keys, any other Software in the Larger Work as well as the Larger Work as a whole may be licensed under the terms of your choice. + +## 5. Term and Termination + +The term of this License begins when You receive the Work, and continues until terminated for any of the reasons described herein, or until all Licensor’s intellectual property rights in the Software expire, whichever comes first (“Term”). This License cannot be revoked, only terminated for the reasons listed below. + +### 5.1. Effect of Termination + +If this License is terminated for any reason, all permissions granted to You under Section 3 by any Licensor automatically terminate. You will immediately cease exercising any permissions granted in this License relative to the Work, including as part of any Modified Work. + +### 5.2. Termination for Non-Compliance; Reinstatement + +This License terminates automatically if You fail to comply with any of the conditions in section 4. As a special exception to termination for non-compliance, Your permissions for the Work under this License will automatically be reinstated if You come into compliance with all the conditions in section 2 within sixty (60) days of being notified by Licensor or an intended third party beneficiary of Your noncompliance. You are eligible for reinstatement of permissions for the Work one time only, and only for the sixty days immediately after becoming aware of noncompliance. Loss of permissions granted for the Work under this License due to either a) sustained noncompliance lasting more than sixty days or b) subsequent termination for noncompliance after reinstatement, is permanent, unless rights are specifically restored by Licensor in writing. + +### 5.3 Termination Due to Litigation + +If You initiate litigation against Licensor, or any Recipient of the Work, either direct or indirect, asserting that the Work directly or indirectly infringes any patent, then all permissions granted to You by this License shall terminate. In the event of termination due to litigation, all permissions validly granted by You under this License, directly or indirectly, shall survive termination. Administrative review procedures, declaratory judgment actions, counterclaims in response to patent litigation, and enforcement actions against former Licensees terminated under this section do not cause termination due to litigation. + +## 6. Disclaimer of Warranty and Limit on Liability + +As far as the law allows, the Work comes AS-IS, without any warranty of any kind, and no Licensor or contributor will be liable to anyone for any damages related to this software or this license, under any kind of legal claim, or for any type of damages, including indirect, special, incidental, or consequential damages of any type arising as a result of this License or the use of the Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, loss of profits, revenue, or any and all other commercial damages or losses. + +## 7. Other Provisions + +### 7.1. Affiliates + +An “Affiliate” means any other entity that, directly or indirectly through one or more intermediaries, controls, is controlled by, or is under common control with, the Licensee. Employees of a Licensee and natural persons acting as contractors exclusively providing services to Licensee are also Affiliates. + +### 7.2. Choice of Jurisdiction and Governing Law + +A Licensor may require that any action or suit by a Licensee relating to a Work provided by Licensor under this License may be brought only in the courts of a particular jurisdiction and under the laws of a particular jurisdiction (excluding its conflict-of-law provisions), if Licensor provides conspicuous notice of the particular jurisdiction to all Licensees. + +### 7.3. No Sublicensing + +This License is not sublicensable. Each time You provide the Work or a Modified Work to a Recipient, the Recipient automatically receives a license under the terms described in this License. You may not impose any further reservations, conditions, or other provisions on any Recipients’ exercise of the permissions granted herein. + +### 7.4. Attorneys' Fees + +In any action to enforce the terms of this License, or seeking damages relating thereto, including by an intended third party beneficiary, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. A “prevailing party” is the party that achieves, or avoids, compliance with this License, including through settlement. This section shall survive the termination of this License. + +### 7.5. No Waiver + +Any failure by Licensor to enforce any provision of this License will not constitute a present or future waiver of such provision nor limit Licensor’s ability to enforce such provision at a later time. + +### 7.6. Severability + +If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. Any invalid or unenforceable portion will be interpreted to the effect and intent of the original portion. If such a construction is not possible, the invalid or unenforceable portion will be severed from this License but the rest of this License will remain in full force and effect. + +### 7.7. License for the Text of this License + +The text of this license is released under the Creative Commons Attribution-ShareAlike 4.0 International License, with the caveat that any modifications of this license may not use the name “DecentraLicense” or any name confusingly similar thereto to describe any derived work of this License. diff --git a/README.md b/README.md index 9f8285127..ce2efdb68 100644 --- a/README.md +++ b/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. \ No newline at end of file diff --git a/REUSE.toml b/REUSE.toml new file mode 100644 index 000000000..81306cf33 --- /dev/null +++ b/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" diff --git a/flake.lock b/flake.lock index 096da8bd1..e13e50b58 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -368,11 +368,11 @@ "solc": "solc_2" }, "locked": { - "lastModified": 1725379854, - "narHash": "sha256-VSVbJMYLaqhID9jKlg3a3Ju7rg41qHezRVUT9dLy9T0=", + "lastModified": 1728997542, + "narHash": "sha256-D/CtiI2B1GoAkhGc0Bxq0XPZItWSgBhTPlW//kW4Kqw=", "owner": "rainlanguage", "repo": "rainix", - "rev": "3f9bc34cc6ace57ac9f557e2c9185830dad31fc7", + "rev": "b2722bcc1856af6c925128962ff24fda1bbc2c82", "type": "github" }, "original": { diff --git a/foundry.toml b/foundry.toml index 826165d31..a355f3ab3 100644 --- a/foundry.toml +++ b/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", ] diff --git a/lib/rain.interpreter b/lib/rain.interpreter index 6e90c7d7b..f98e23520 160000 --- a/lib/rain.interpreter +++ b/lib/rain.interpreter @@ -1 +1 @@ -Subproject commit 6e90c7d7b52b8aa0154fd6ed8b4a05b94c793468 +Subproject commit f98e235202308837f3053b964bbb0fb071ae737a diff --git a/lib/rain.orderbook.interface b/lib/rain.orderbook.interface index c105aa766..8b6a0c27c 160000 --- a/lib/rain.orderbook.interface +++ b/lib/rain.orderbook.interface @@ -1 +1 @@ -Subproject commit c105aa7664406d0fa3c25a14861374d490a424f6 +Subproject commit 8b6a0c27caa02b888177d000fb7605fb28834df5 diff --git a/package-lock.json b/package-lock.json index 41820f38f..5fcc464c9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,7 +7,7 @@ "": { "name": "@rainlanguage/orderbook", "version": "0.0.1-alpha.4", - "license": "CAL-1.0", + "license": "LicenseRef-DCL-1.0", "dependencies": { "buffer": "^6.0.3" }, diff --git a/package.json b/package.json index 5261b910c..d538460f6 100644 --- a/package.json +++ b/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" diff --git a/script/BuildAuthoringMeta.sol b/script/BuildAuthoringMeta.sol index 761506be7..144a46f31 100644 --- a/script/BuildAuthoringMeta.sol +++ b/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"; diff --git a/script/BuildPointers.sol b/script/BuildPointers.sol index fac3bce60..f038243ed 100644 --- a/script/BuildPointers.sol +++ b/script/BuildPointers.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"; @@ -6,6 +7,7 @@ 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), diff --git a/script/Deploy.sol b/script/Deploy.sol index 8ef7a04a0..1c5bcead7 100644 --- a/script/Deploy.sol +++ b/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"; diff --git a/src/abstract/OrderBookV4ArbCommon.sol b/src/abstract/OrderBookV4ArbCommon.sol index 131848659..3d9894866 100644 --- a/src/abstract/OrderBookV4ArbCommon.sol +++ b/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"; diff --git a/src/abstract/OrderBookV4ArbOrderTaker.sol b/src/abstract/OrderBookV4ArbOrderTaker.sol index 6606e2772..6e0d0d801 100644 --- a/src/abstract/OrderBookV4ArbOrderTaker.sol +++ b/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"; diff --git a/src/abstract/OrderBookV4FlashBorrower.sol b/src/abstract/OrderBookV4FlashBorrower.sol index 360ebcc6d..9d8f78e9e 100644 --- a/src/abstract/OrderBookV4FlashBorrower.sol +++ b/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"; diff --git a/src/abstract/OrderBookV4FlashLender.sol b/src/abstract/OrderBookV4FlashLender.sol index e5d83fd1f..3934c0262 100644 --- a/src/abstract/OrderBookV4FlashLender.sol +++ b/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"; diff --git a/src/concrete/arb/GenericPoolOrderBookV4ArbOrderTaker.sol b/src/concrete/arb/GenericPoolOrderBookV4ArbOrderTaker.sol index 491bf4326..c8d6227b7 100644 --- a/src/concrete/arb/GenericPoolOrderBookV4ArbOrderTaker.sol +++ b/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"; diff --git a/src/concrete/arb/GenericPoolOrderBookV4FlashBorrower.sol b/src/concrete/arb/GenericPoolOrderBookV4FlashBorrower.sol index 991e8a860..ff7d3076b 100644 --- a/src/concrete/arb/GenericPoolOrderBookV4FlashBorrower.sol +++ b/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"; diff --git a/src/concrete/arb/RouteProcessorOrderBookV4ArbOrderTaker.sol b/src/concrete/arb/RouteProcessorOrderBookV4ArbOrderTaker.sol index c8cad2a52..8b2fd036a 100644 --- a/src/concrete/arb/RouteProcessorOrderBookV4ArbOrderTaker.sol +++ b/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"; diff --git a/src/concrete/ob/OrderBook.sol b/src/concrete/ob/OrderBook.sol index 37dcbc75c..a8c7ef6d9 100644 --- a/src/concrete/ob/OrderBook.sol +++ b/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"; diff --git a/src/concrete/parser/OrderBookSubParser.sol b/src/concrete/parser/OrderBookSubParser.sol index bf828a103..1f595f07d 100644 --- a/src/concrete/parser/OrderBookSubParser.sol +++ b/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 { diff --git a/src/generated/OrderBookSubParser.pointers.sol b/src/generated/OrderBookSubParser.pointers.sol index 7aa7d534c..854ad3b37 100644 --- a/src/generated/OrderBookSubParser.pointers.sol +++ b/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. diff --git a/src/lib/LibOrder.sol b/src/lib/LibOrder.sol index 47529528d..e8bb91eba 100644 --- a/src/lib/LibOrder.sol +++ b/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"; diff --git a/src/lib/LibOrderBook.sol b/src/lib/LibOrderBook.sol index a9a03da6b..36911e689 100644 --- a/src/lib/LibOrderBook.sol +++ b/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 { diff --git a/src/lib/LibOrderBookArb.sol b/src/lib/LibOrderBookArb.sol index 6b1120a57..66049b6ad 100644 --- a/src/lib/LibOrderBookArb.sol +++ b/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"; diff --git a/src/lib/LibOrderBookSubParser.sol b/src/lib/LibOrderBookSubParser.sol index d9714cfc6..8afc96b67 100644 --- a/src/lib/LibOrderBookSubParser.sol +++ b/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"; diff --git a/subgraph/package.json b/subgraph/package.json index 4669bb850..1bd3ece1b 100644 --- a/subgraph/package.json +++ b/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" }, diff --git a/tauri-app/package.json b/tauri-app/package.json index 4ebcb6270..701496a62 100644 --- a/tauri-app/package.json +++ b/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", diff --git a/tauri-app/src-tauri/Cargo.toml b/tauri-app/src-tauri/Cargo.toml index 8f1333578..a206b863b 100644 --- a/tauri-app/src-tauri/Cargo.toml +++ b/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 diff --git a/test/abstract/OrderBookV4ArbOrderTaker.context.t.sol b/test/abstract/OrderBookV4ArbOrderTaker.context.t.sol index 941028410..8d5085ad4 100644 --- a/test/abstract/OrderBookV4ArbOrderTaker.context.t.sol +++ b/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 { diff --git a/test/abstract/OrderBookV4ArbOrderTaker.ierc165.t.sol b/test/abstract/OrderBookV4ArbOrderTaker.ierc165.t.sol index f5923e825..c2810766c 100644 --- a/test/abstract/OrderBookV4ArbOrderTaker.ierc165.t.sol +++ b/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"; diff --git a/test/abstract/OrderBookV4FlashBorrower.ierc165.t.sol b/test/abstract/OrderBookV4FlashBorrower.ierc165.t.sol index ab5d50ef9..3d93eca32 100644 --- a/test/abstract/OrderBookV4FlashBorrower.ierc165.t.sol +++ b/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"; diff --git a/test/abstract/OrderBookV4FlashLender.fee.t.sol b/test/abstract/OrderBookV4FlashLender.fee.t.sol index 5052e3356..ce2b33e0b 100644 --- a/test/abstract/OrderBookV4FlashLender.fee.t.sol +++ b/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"; diff --git a/test/abstract/OrderBookV4FlashLender.griefRecipient.t.sol b/test/abstract/OrderBookV4FlashLender.griefRecipient.t.sol index 09d04c54d..38bccea4f 100644 --- a/test/abstract/OrderBookV4FlashLender.griefRecipient.t.sol +++ b/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"; diff --git a/test/abstract/OrderBookV4FlashLender.ierc165.t.sol b/test/abstract/OrderBookV4FlashLender.ierc165.t.sol index 1ec1b5443..2b595fefa 100644 --- a/test/abstract/OrderBookV4FlashLender.ierc165.t.sol +++ b/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"; diff --git a/test/abstract/OrderBookV4FlashLender.maxFlashLoan.t.sol b/test/abstract/OrderBookV4FlashLender.maxFlashLoan.t.sol index 98fe25de3..8fa3e32a3 100644 --- a/test/abstract/OrderBookV4FlashLender.maxFlashLoan.t.sol +++ b/test/abstract/OrderBookV4FlashLender.maxFlashLoan.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"; diff --git a/test/abstract/OrderBookV4FlashLender.mockSuccess.t.sol b/test/abstract/OrderBookV4FlashLender.mockSuccess.t.sol index 3b4df6aa5..e6c095f3b 100644 --- a/test/abstract/OrderBookV4FlashLender.mockSuccess.t.sol +++ b/test/abstract/OrderBookV4FlashLender.mockSuccess.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"; diff --git a/test/abstract/OrderBookV4FlashLender.reentrant.t.sol b/test/abstract/OrderBookV4FlashLender.reentrant.t.sol index 80ff4010f..0f12eeade 100644 --- a/test/abstract/OrderBookV4FlashLender.reentrant.t.sol +++ b/test/abstract/OrderBookV4FlashLender.reentrant.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 {Vm} from "forge-std/Vm.sol"; diff --git a/test/abstract/OrderBookV4FlashLender.transfers.t.sol b/test/abstract/OrderBookV4FlashLender.transfers.t.sol index a527eef4e..4c6b3136d 100644 --- a/test/abstract/OrderBookV4FlashLender.transfers.t.sol +++ b/test/abstract/OrderBookV4FlashLender.transfers.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 {stdError} from "forge-std/Test.sol"; diff --git a/test/concrete/arb/GenericPoolOrderBookV4ArbOrderTaker.expression.t.sol b/test/concrete/arb/GenericPoolOrderBookV4ArbOrderTaker.expression.t.sol index ef78085b1..889cfedce 100644 --- a/test/concrete/arb/GenericPoolOrderBookV4ArbOrderTaker.expression.t.sol +++ b/test/concrete/arb/GenericPoolOrderBookV4ArbOrderTaker.expression.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 {GenericPoolOrderBookV4ArbOrderTakerTest} from "test/util/abstract/GenericPoolOrderBookV4ArbOrderTakerTest.sol"; diff --git a/test/concrete/arb/GenericPoolOrderBookV4ArbOrderTaker.sender.t.sol b/test/concrete/arb/GenericPoolOrderBookV4ArbOrderTaker.sender.t.sol index 89f00ae48..907b17077 100644 --- a/test/concrete/arb/GenericPoolOrderBookV4ArbOrderTaker.sender.t.sol +++ b/test/concrete/arb/GenericPoolOrderBookV4ArbOrderTaker.sender.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 {GenericPoolOrderBookV4ArbOrderTakerTest} from "test/util/abstract/GenericPoolOrderBookV4ArbOrderTakerTest.sol"; diff --git a/test/concrete/arb/GenericPoolOrderBookV4FlashBorrower.sender.t.sol b/test/concrete/arb/GenericPoolOrderBookV4FlashBorrower.sender.t.sol index 3f9145c53..983c45073 100644 --- a/test/concrete/arb/GenericPoolOrderBookV4FlashBorrower.sender.t.sol +++ b/test/concrete/arb/GenericPoolOrderBookV4FlashBorrower.sender.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 {ArbTest} from "test/util/abstract/ArbTest.sol"; diff --git a/test/concrete/arb/RouteProcessorOrderBookV4ArbOrderTaker.expression.t.sol b/test/concrete/arb/RouteProcessorOrderBookV4ArbOrderTaker.expression.t.sol index f99b51285..836210da4 100644 --- a/test/concrete/arb/RouteProcessorOrderBookV4ArbOrderTaker.expression.t.sol +++ b/test/concrete/arb/RouteProcessorOrderBookV4ArbOrderTaker.expression.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 {RouteProcessorOrderBookV4ArbOrderTakerTest} from diff --git a/test/concrete/arb/RouteProcessorOrderBookV4ArbOrderTaker.sender.t.sol b/test/concrete/arb/RouteProcessorOrderBookV4ArbOrderTaker.sender.t.sol index 2d042a76c..05847d056 100644 --- a/test/concrete/arb/RouteProcessorOrderBookV4ArbOrderTaker.sender.t.sol +++ b/test/concrete/arb/RouteProcessorOrderBookV4ArbOrderTaker.sender.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 {RouteProcessorOrderBookV4ArbOrderTakerTest} from diff --git a/test/concrete/ob/OrderBook.addOrder.entask.t.sol b/test/concrete/ob/OrderBook.addOrder.entask.t.sol index 161dea057..065c6e99f 100644 --- a/test/concrete/ob/OrderBook.addOrder.entask.t.sol +++ b/test/concrete/ob/OrderBook.addOrder.entask.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 {OrderBookExternalRealTest} from "test/util/abstract/OrderBookExternalRealTest.sol"; diff --git a/test/concrete/ob/OrderBook.addOrder.mock.t.sol b/test/concrete/ob/OrderBook.addOrder.mock.t.sol index 529761b65..5efcc210a 100644 --- a/test/concrete/ob/OrderBook.addOrder.mock.t.sol +++ b/test/concrete/ob/OrderBook.addOrder.mock.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"; diff --git a/test/concrete/ob/OrderBook.addOrder.nonce.t.sol b/test/concrete/ob/OrderBook.addOrder.nonce.t.sol index 3ab548820..fece4b03a 100644 --- a/test/concrete/ob/OrderBook.addOrder.nonce.t.sol +++ b/test/concrete/ob/OrderBook.addOrder.nonce.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 {OrderBookExternalRealTest} from "test/util/abstract/OrderBookExternalRealTest.sol"; diff --git a/test/concrete/ob/OrderBook.addOrder.owner.t.sol b/test/concrete/ob/OrderBook.addOrder.owner.t.sol index fd4608d22..76593a5a5 100644 --- a/test/concrete/ob/OrderBook.addOrder.owner.t.sol +++ b/test/concrete/ob/OrderBook.addOrder.owner.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 {OrderBookExternalRealTest} from "test/util/abstract/OrderBookExternalRealTest.sol"; diff --git a/test/concrete/ob/OrderBook.addOrder.t.sol b/test/concrete/ob/OrderBook.addOrder.t.sol index 14b4e2ae4..a1f2f6552 100644 --- a/test/concrete/ob/OrderBook.addOrder.t.sol +++ b/test/concrete/ob/OrderBook.addOrder.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 {OrderBookExternalRealTest} from "test/util/abstract/OrderBookExternalRealTest.sol"; diff --git a/test/concrete/ob/OrderBook.clear.badStack.t.sol b/test/concrete/ob/OrderBook.clear.badStack.t.sol index 5702a1241..4899e9ac0 100644 --- a/test/concrete/ob/OrderBook.clear.badStack.t.sol +++ b/test/concrete/ob/OrderBook.clear.badStack.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 {OrderBookExternalRealTest} from "test/util/abstract/OrderBookExternalRealTest.sol"; diff --git a/test/concrete/ob/OrderBook.clear.context.t.sol b/test/concrete/ob/OrderBook.clear.context.t.sol index dc6b86b27..638a7c714 100644 --- a/test/concrete/ob/OrderBook.clear.context.t.sol +++ b/test/concrete/ob/OrderBook.clear.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 {OrderBookExternalRealTest} from "test/util/abstract/OrderBookExternalRealTest.sol"; diff --git a/test/concrete/ob/OrderBook.clear.handleIO.revert.t.sol b/test/concrete/ob/OrderBook.clear.handleIO.revert.t.sol index c6546ded7..621ada147 100644 --- a/test/concrete/ob/OrderBook.clear.handleIO.revert.t.sol +++ b/test/concrete/ob/OrderBook.clear.handleIO.revert.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 {Vm} from "forge-std/Vm.sol"; diff --git a/test/concrete/ob/OrderBook.clear.mock.t.sol b/test/concrete/ob/OrderBook.clear.mock.t.sol index 082d8b36f..e7cee4a81 100644 --- a/test/concrete/ob/OrderBook.clear.mock.t.sol +++ b/test/concrete/ob/OrderBook.clear.mock.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"; diff --git a/test/concrete/ob/OrderBook.clear.sameToken.t.sol b/test/concrete/ob/OrderBook.clear.sameToken.t.sol index faf7adabc..98315784c 100644 --- a/test/concrete/ob/OrderBook.clear.sameToken.t.sol +++ b/test/concrete/ob/OrderBook.clear.sameToken.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 {OrderBookExternalRealTest} from "test/util/abstract/OrderBookExternalRealTest.sol"; diff --git a/test/concrete/ob/OrderBook.deposit.entask.t.sol b/test/concrete/ob/OrderBook.deposit.entask.t.sol index fd83ceb69..10c9cc9fe 100644 --- a/test/concrete/ob/OrderBook.deposit.entask.t.sol +++ b/test/concrete/ob/OrderBook.deposit.entask.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 {OrderBookExternalRealTest} from "test/util/abstract/OrderBookExternalRealTest.sol"; diff --git a/test/concrete/ob/OrderBook.deposit.t.sol b/test/concrete/ob/OrderBook.deposit.t.sol index fcd39a8db..1261bf39c 100644 --- a/test/concrete/ob/OrderBook.deposit.t.sol +++ b/test/concrete/ob/OrderBook.deposit.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 {stdError} from "forge-std/Test.sol"; diff --git a/test/concrete/ob/OrderBook.entask.t.sol b/test/concrete/ob/OrderBook.entask.t.sol index a10151b6f..411cc0882 100644 --- a/test/concrete/ob/OrderBook.entask.t.sol +++ b/test/concrete/ob/OrderBook.entask.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 {OrderBookExternalRealTest} from "test/util/abstract/OrderBookExternalRealTest.sol"; diff --git a/test/concrete/ob/OrderBook.quote.sameToken.t.sol b/test/concrete/ob/OrderBook.quote.sameToken.t.sol index dcffc1d9e..34ef808b2 100644 --- a/test/concrete/ob/OrderBook.quote.sameToken.t.sol +++ b/test/concrete/ob/OrderBook.quote.sameToken.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 {OrderBookExternalRealTest} from "test/util/abstract/OrderBookExternalRealTest.sol"; diff --git a/test/concrete/ob/OrderBook.quote.t.sol b/test/concrete/ob/OrderBook.quote.t.sol index 27b0545a9..3501f3479 100644 --- a/test/concrete/ob/OrderBook.quote.t.sol +++ b/test/concrete/ob/OrderBook.quote.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 {OrderBookExternalRealTest} from "test/util/abstract/OrderBookExternalRealTest.sol"; diff --git a/test/concrete/ob/OrderBook.removeOrder.entask.t.sol b/test/concrete/ob/OrderBook.removeOrder.entask.t.sol index c93ef7430..b8c0de44e 100644 --- a/test/concrete/ob/OrderBook.removeOrder.entask.t.sol +++ b/test/concrete/ob/OrderBook.removeOrder.entask.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 {OrderBookExternalRealTest} from "test/util/abstract/OrderBookExternalRealTest.sol"; diff --git a/test/concrete/ob/OrderBook.removeOrder.mock.t.sol b/test/concrete/ob/OrderBook.removeOrder.mock.t.sol index d900f92d5..a263e99ac 100644 --- a/test/concrete/ob/OrderBook.removeOrder.mock.t.sol +++ b/test/concrete/ob/OrderBook.removeOrder.mock.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"; diff --git a/test/concrete/ob/OrderBook.removeOrder.owner.t.sol b/test/concrete/ob/OrderBook.removeOrder.owner.t.sol index a45f7b516..a46ffcb74 100644 --- a/test/concrete/ob/OrderBook.removeOrder.owner.t.sol +++ b/test/concrete/ob/OrderBook.removeOrder.owner.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 {OrderBookExternalRealTest} from "test/util/abstract/OrderBookExternalRealTest.sol"; diff --git a/test/concrete/ob/OrderBook.takeOrder.badStack.t.sol b/test/concrete/ob/OrderBook.takeOrder.badStack.t.sol index d4872586b..2d8f1058f 100644 --- a/test/concrete/ob/OrderBook.takeOrder.badStack.t.sol +++ b/test/concrete/ob/OrderBook.takeOrder.badStack.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 {OrderBookExternalRealTest} from "test/util/abstract/OrderBookExternalRealTest.sol"; diff --git a/test/concrete/ob/OrderBook.takeOrder.handleIO.revert.t.sol b/test/concrete/ob/OrderBook.takeOrder.handleIO.revert.t.sol index 031323f86..25cac9abf 100644 --- a/test/concrete/ob/OrderBook.takeOrder.handleIO.revert.t.sol +++ b/test/concrete/ob/OrderBook.takeOrder.handleIO.revert.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 {Vm} from "forge-std/Vm.sol"; diff --git a/test/concrete/ob/OrderBook.takeOrder.maximumInput.t.sol b/test/concrete/ob/OrderBook.takeOrder.maximumInput.t.sol index 0b89a538c..a4dbcfff9 100644 --- a/test/concrete/ob/OrderBook.takeOrder.maximumInput.t.sol +++ b/test/concrete/ob/OrderBook.takeOrder.maximumInput.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 {IERC20} from "openzeppelin-contracts/contracts/token/ERC20/IERC20.sol"; diff --git a/test/concrete/ob/OrderBook.takeOrder.noop.t.sol b/test/concrete/ob/OrderBook.takeOrder.noop.t.sol index b00d002ec..e482eec4d 100644 --- a/test/concrete/ob/OrderBook.takeOrder.noop.t.sol +++ b/test/concrete/ob/OrderBook.takeOrder.noop.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 {Vm} from "forge-std/Test.sol"; diff --git a/test/concrete/ob/OrderBook.takeOrder.precision.t.sol b/test/concrete/ob/OrderBook.takeOrder.precision.t.sol index 76e6462b9..eeaa3547f 100644 --- a/test/concrete/ob/OrderBook.takeOrder.precision.t.sol +++ b/test/concrete/ob/OrderBook.takeOrder.precision.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 {Vm} from "forge-std/Test.sol"; diff --git a/test/concrete/ob/OrderBook.takeOrder.sameToken.t.sol b/test/concrete/ob/OrderBook.takeOrder.sameToken.t.sol index 76e9681ca..7441a7dca 100644 --- a/test/concrete/ob/OrderBook.takeOrder.sameToken.t.sol +++ b/test/concrete/ob/OrderBook.takeOrder.sameToken.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 {OrderBookExternalRealTest} from "test/util/abstract/OrderBookExternalRealTest.sol"; diff --git a/test/concrete/ob/OrderBook.takeOrder.tokenMismatch.t.sol b/test/concrete/ob/OrderBook.takeOrder.tokenMismatch.t.sol index 7ba309ec2..59c5a7a27 100644 --- a/test/concrete/ob/OrderBook.takeOrder.tokenMismatch.t.sol +++ b/test/concrete/ob/OrderBook.takeOrder.tokenMismatch.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 {OrderBookExternalRealTest} from "test/util/abstract/OrderBookExternalRealTest.sol"; diff --git a/test/concrete/ob/OrderBook.takeOrder.tokenMismatchDecimals.t.sol b/test/concrete/ob/OrderBook.takeOrder.tokenMismatchDecimals.t.sol index 871bfd469..78e3429db 100644 --- a/test/concrete/ob/OrderBook.takeOrder.tokenMismatchDecimals.t.sol +++ b/test/concrete/ob/OrderBook.takeOrder.tokenMismatchDecimals.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 {OrderBookExternalRealTest} from "test/util/abstract/OrderBookExternalRealTest.sol"; diff --git a/test/concrete/ob/OrderBook.vaultBalance.t.sol b/test/concrete/ob/OrderBook.vaultBalance.t.sol index cc7602e5b..b5f389983 100644 --- a/test/concrete/ob/OrderBook.vaultBalance.t.sol +++ b/test/concrete/ob/OrderBook.vaultBalance.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"; diff --git a/test/concrete/ob/OrderBook.withdraw.entask.t.sol b/test/concrete/ob/OrderBook.withdraw.entask.t.sol index 78025ef0d..131af8512 100644 --- a/test/concrete/ob/OrderBook.withdraw.entask.t.sol +++ b/test/concrete/ob/OrderBook.withdraw.entask.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 {OrderBookExternalRealTest} from "test/util/abstract/OrderBookExternalRealTest.sol"; diff --git a/test/concrete/ob/OrderBook.withdraw.t.sol b/test/concrete/ob/OrderBook.withdraw.t.sol index 88498d4ef..1d03aece7 100644 --- a/test/concrete/ob/OrderBook.withdraw.t.sol +++ b/test/concrete/ob/OrderBook.withdraw.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"; diff --git a/test/concrete/parser/OrderBookSubParser.contextCalculatedIORatio.t.sol b/test/concrete/parser/OrderBookSubParser.contextCalculatedIORatio.t.sol index 74cafffb4..293f0b20c 100644 --- a/test/concrete/parser/OrderBookSubParser.contextCalculatedIORatio.t.sol +++ b/test/concrete/parser/OrderBookSubParser.contextCalculatedIORatio.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 {OrderBookSubParserContextTest} from "test/util/abstract/OrderBookSubParserContextTest.sol"; diff --git a/test/concrete/parser/OrderBookSubParser.contextCalculatedMaxOutput.t.sol b/test/concrete/parser/OrderBookSubParser.contextCalculatedMaxOutput.t.sol index b20bf2558..dde1a5c82 100644 --- a/test/concrete/parser/OrderBookSubParser.contextCalculatedMaxOutput.t.sol +++ b/test/concrete/parser/OrderBookSubParser.contextCalculatedMaxOutput.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 {OrderBookSubParserContextTest} from "test/util/abstract/OrderBookSubParserContextTest.sol"; diff --git a/test/concrete/parser/OrderBookSubParser.contextInputToken.t.sol b/test/concrete/parser/OrderBookSubParser.contextInputToken.t.sol index af089fa2c..d64b1115f 100644 --- a/test/concrete/parser/OrderBookSubParser.contextInputToken.t.sol +++ b/test/concrete/parser/OrderBookSubParser.contextInputToken.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 {OrderBookSubParserContextTest} from "test/util/abstract/OrderBookSubParserContextTest.sol"; diff --git a/test/concrete/parser/OrderBookSubParser.contextInputTokenDecimals.t.sol b/test/concrete/parser/OrderBookSubParser.contextInputTokenDecimals.t.sol index 360bad5bf..235217c5e 100644 --- a/test/concrete/parser/OrderBookSubParser.contextInputTokenDecimals.t.sol +++ b/test/concrete/parser/OrderBookSubParser.contextInputTokenDecimals.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 {OrderBookSubParserContextTest} from "test/util/abstract/OrderBookSubParserContextTest.sol"; diff --git a/test/concrete/parser/OrderBookSubParser.contextInputVaultBalanceBefore.t.sol b/test/concrete/parser/OrderBookSubParser.contextInputVaultBalanceBefore.t.sol index 2ca4e9b7e..7cc42f720 100644 --- a/test/concrete/parser/OrderBookSubParser.contextInputVaultBalanceBefore.t.sol +++ b/test/concrete/parser/OrderBookSubParser.contextInputVaultBalanceBefore.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 {OrderBookSubParserContextTest} from "test/util/abstract/OrderBookSubParserContextTest.sol"; diff --git a/test/concrete/parser/OrderBookSubParser.contextInputVaultBalanceIncrease.t.sol b/test/concrete/parser/OrderBookSubParser.contextInputVaultBalanceIncrease.t.sol index 09c395487..7fbd0a06b 100644 --- a/test/concrete/parser/OrderBookSubParser.contextInputVaultBalanceIncrease.t.sol +++ b/test/concrete/parser/OrderBookSubParser.contextInputVaultBalanceIncrease.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 {OrderBookSubParserContextTest} from "test/util/abstract/OrderBookSubParserContextTest.sol"; diff --git a/test/concrete/parser/OrderBookSubParser.contextInputVaultId.t.sol b/test/concrete/parser/OrderBookSubParser.contextInputVaultId.t.sol index 2b7369081..d737dd91e 100644 --- a/test/concrete/parser/OrderBookSubParser.contextInputVaultId.t.sol +++ b/test/concrete/parser/OrderBookSubParser.contextInputVaultId.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 {OrderBookSubParserContextTest} from "test/util/abstract/OrderBookSubParserContextTest.sol"; diff --git a/test/concrete/parser/OrderBookSubParser.contextOrderBook.t.sol b/test/concrete/parser/OrderBookSubParser.contextOrderBook.t.sol index b2d716bb8..62f76b043 100644 --- a/test/concrete/parser/OrderBookSubParser.contextOrderBook.t.sol +++ b/test/concrete/parser/OrderBookSubParser.contextOrderBook.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 {OrderBookSubParserContextTest} from "test/util/abstract/OrderBookSubParserContextTest.sol"; diff --git a/test/concrete/parser/OrderBookSubParser.contextOrderClearer.t.sol b/test/concrete/parser/OrderBookSubParser.contextOrderClearer.t.sol index 75a04fb32..452f3fcb1 100644 --- a/test/concrete/parser/OrderBookSubParser.contextOrderClearer.t.sol +++ b/test/concrete/parser/OrderBookSubParser.contextOrderClearer.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 {OrderBookSubParserContextTest} from "test/util/abstract/OrderBookSubParserContextTest.sol"; diff --git a/test/concrete/parser/OrderBookSubParser.contextOrderCounterparty.t.sol b/test/concrete/parser/OrderBookSubParser.contextOrderCounterparty.t.sol index 12385b368..fdc8bb663 100644 --- a/test/concrete/parser/OrderBookSubParser.contextOrderCounterparty.t.sol +++ b/test/concrete/parser/OrderBookSubParser.contextOrderCounterparty.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 {OrderBookSubParserContextTest} from "test/util/abstract/OrderBookSubParserContextTest.sol"; diff --git a/test/concrete/parser/OrderBookSubParser.contextOrderHash.t.sol b/test/concrete/parser/OrderBookSubParser.contextOrderHash.t.sol index 47ef24b28..dd6b2d955 100644 --- a/test/concrete/parser/OrderBookSubParser.contextOrderHash.t.sol +++ b/test/concrete/parser/OrderBookSubParser.contextOrderHash.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 {OrderBookSubParserContextTest} from "test/util/abstract/OrderBookSubParserContextTest.sol"; diff --git a/test/concrete/parser/OrderBookSubParser.contextOrderOwner.t.sol b/test/concrete/parser/OrderBookSubParser.contextOrderOwner.t.sol index bc9241e6e..f9c8dca54 100644 --- a/test/concrete/parser/OrderBookSubParser.contextOrderOwner.t.sol +++ b/test/concrete/parser/OrderBookSubParser.contextOrderOwner.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 {OrderBookSubParserContextTest} from "test/util/abstract/OrderBookSubParserContextTest.sol"; diff --git a/test/concrete/parser/OrderBookSubParser.contextOutputToken.t.sol b/test/concrete/parser/OrderBookSubParser.contextOutputToken.t.sol index 5c1c0a9ee..a389a4dfd 100644 --- a/test/concrete/parser/OrderBookSubParser.contextOutputToken.t.sol +++ b/test/concrete/parser/OrderBookSubParser.contextOutputToken.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 {OrderBookSubParserContextTest} from "test/util/abstract/OrderBookSubParserContextTest.sol"; diff --git a/test/concrete/parser/OrderBookSubParser.contextOutputTokenDecimals.t.sol b/test/concrete/parser/OrderBookSubParser.contextOutputTokenDecimals.t.sol index 052b80bd7..72fc12c8a 100644 --- a/test/concrete/parser/OrderBookSubParser.contextOutputTokenDecimals.t.sol +++ b/test/concrete/parser/OrderBookSubParser.contextOutputTokenDecimals.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 {OrderBookSubParserContextTest} from "test/util/abstract/OrderBookSubParserContextTest.sol"; diff --git a/test/concrete/parser/OrderBookSubParser.contextOutputVaultBalanceBefore.t.sol b/test/concrete/parser/OrderBookSubParser.contextOutputVaultBalanceBefore.t.sol index 3634f02b4..56eb36701 100644 --- a/test/concrete/parser/OrderBookSubParser.contextOutputVaultBalanceBefore.t.sol +++ b/test/concrete/parser/OrderBookSubParser.contextOutputVaultBalanceBefore.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 {OrderBookSubParserContextTest} from "test/util/abstract/OrderBookSubParserContextTest.sol"; diff --git a/test/concrete/parser/OrderBookSubParser.contextOutputVaultBalanceDecrease.t.sol b/test/concrete/parser/OrderBookSubParser.contextOutputVaultBalanceDecrease.t.sol index 4cbd66971..2726f82ec 100644 --- a/test/concrete/parser/OrderBookSubParser.contextOutputVaultBalanceDecrease.t.sol +++ b/test/concrete/parser/OrderBookSubParser.contextOutputVaultBalanceDecrease.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 {OrderBookSubParserContextTest} from "test/util/abstract/OrderBookSubParserContextTest.sol"; diff --git a/test/concrete/parser/OrderBookSubParser.contextOutputVaultId.t.sol b/test/concrete/parser/OrderBookSubParser.contextOutputVaultId.t.sol index 08d8a4d07..66c7ad0be 100644 --- a/test/concrete/parser/OrderBookSubParser.contextOutputVaultId.t.sol +++ b/test/concrete/parser/OrderBookSubParser.contextOutputVaultId.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 {OrderBookSubParserContextTest} from "test/util/abstract/OrderBookSubParserContextTest.sol"; diff --git a/test/concrete/parser/OrderBookSubParser.describedByMeta.t.sol b/test/concrete/parser/OrderBookSubParser.describedByMeta.t.sol index 906dd578d..3c4bec86a 100644 --- a/test/concrete/parser/OrderBookSubParser.describedByMeta.t.sol +++ b/test/concrete/parser/OrderBookSubParser.describedByMeta.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"; diff --git a/test/concrete/parser/OrderBookSubParser.ierc165.t.sol b/test/concrete/parser/OrderBookSubParser.ierc165.t.sol index e971537ba..bf11ca3d9 100644 --- a/test/concrete/parser/OrderBookSubParser.ierc165.t.sol +++ b/test/concrete/parser/OrderBookSubParser.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"; diff --git a/test/concrete/parser/OrderBookSubParser.pointers.t.sol b/test/concrete/parser/OrderBookSubParser.pointers.t.sol index fbf44347b..e2da1fe80 100644 --- a/test/concrete/parser/OrderBookSubParser.pointers.t.sol +++ b/test/concrete/parser/OrderBookSubParser.pointers.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"; @@ -9,7 +10,7 @@ import { SUB_PARSER_OPERAND_HANDLERS, OrderBookSubParser } from "src/concrete/parser/OrderBookSubParser.sol"; -import {LibGenParseMeta} from "rain.sol.codegen/lib/LibGenParseMeta.sol"; +import {LibGenParseMeta} from "rain.interpreter.interface/lib/codegen/LibGenParseMeta.sol"; contract OrderBookSubParserPointersTest is Test { function testSubParserParseMeta() external pure { diff --git a/test/concrete/parser/OrderBookSubParser.signedContext.t.sol b/test/concrete/parser/OrderBookSubParser.signedContext.t.sol index 937726774..3e37ab35f 100644 --- a/test/concrete/parser/OrderBookSubParser.signedContext.t.sol +++ b/test/concrete/parser/OrderBookSubParser.signedContext.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 {StackAllocationMismatch} from "rain.interpreter/error/ErrIntegrity.sol"; diff --git a/test/concrete/parser/OrderBookSubParser.signers.t.sol b/test/concrete/parser/OrderBookSubParser.signers.t.sol index 6edf44f72..9630775a4 100644 --- a/test/concrete/parser/OrderBookSubParser.signers.t.sol +++ b/test/concrete/parser/OrderBookSubParser.signers.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 {StackAllocationMismatch} from "rain.interpreter/error/ErrIntegrity.sol"; diff --git a/test/lib/LibOrder.t.sol b/test/lib/LibOrder.t.sol index fe3e90f25..f0a06394a 100644 --- a/test/lib/LibOrder.t.sol +++ b/test/lib/LibOrder.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"; diff --git a/test/util/abstract/ArbTest.sol b/test/util/abstract/ArbTest.sol index 0e9650182..7201d9016 100644 --- a/test/util/abstract/ArbTest.sol +++ b/test/util/abstract/ArbTest.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"; diff --git a/test/util/abstract/GenericPoolOrderBookV4ArbOrderTakerTest.sol b/test/util/abstract/GenericPoolOrderBookV4ArbOrderTakerTest.sol index 71e8c3b63..636d18308 100644 --- a/test/util/abstract/GenericPoolOrderBookV4ArbOrderTakerTest.sol +++ b/test/util/abstract/GenericPoolOrderBookV4ArbOrderTakerTest.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 {ArbTest} from "./ArbTest.sol"; diff --git a/test/util/abstract/IOrderBookV4Stub.sol b/test/util/abstract/IOrderBookV4Stub.sol index 9eb72efa0..5112f3829 100644 --- a/test/util/abstract/IOrderBookV4Stub.sol +++ b/test/util/abstract/IOrderBookV4Stub.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 { diff --git a/test/util/abstract/OrderBookExternalMockTest.sol b/test/util/abstract/OrderBookExternalMockTest.sol index 899ac416f..0445a760a 100644 --- a/test/util/abstract/OrderBookExternalMockTest.sol +++ b/test/util/abstract/OrderBookExternalMockTest.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"; diff --git a/test/util/abstract/OrderBookExternalRealTest.sol b/test/util/abstract/OrderBookExternalRealTest.sol index 03acd51da..b834e821d 100644 --- a/test/util/abstract/OrderBookExternalRealTest.sol +++ b/test/util/abstract/OrderBookExternalRealTest.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, Vm, console2} from "forge-std/Test.sol"; diff --git a/test/util/abstract/OrderBookSelfTest.sol b/test/util/abstract/OrderBookSelfTest.sol index 84000f7c5..3c802718f 100644 --- a/test/util/abstract/OrderBookSelfTest.sol +++ b/test/util/abstract/OrderBookSelfTest.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"; diff --git a/test/util/abstract/OrderBookSubParserContextTest.sol b/test/util/abstract/OrderBookSubParserContextTest.sol index a65cd3ae2..7e9b037da 100644 --- a/test/util/abstract/OrderBookSubParserContextTest.sol +++ b/test/util/abstract/OrderBookSubParserContextTest.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 {StackAllocationMismatch} from "rain.interpreter/error/ErrIntegrity.sol"; diff --git a/test/util/abstract/RouteProcessorOrderBookV4ArbOrderTakerTest.sol b/test/util/abstract/RouteProcessorOrderBookV4ArbOrderTakerTest.sol index 0647e03e5..eaff00f01 100644 --- a/test/util/abstract/RouteProcessorOrderBookV4ArbOrderTakerTest.sol +++ b/test/util/abstract/RouteProcessorOrderBookV4ArbOrderTakerTest.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 {ArbTest} from "./ArbTest.sol"; diff --git a/test/util/concrete/ChildOrderBookV4ArbOrderTaker.sol b/test/util/concrete/ChildOrderBookV4ArbOrderTaker.sol index 0a371ab2a..7107cfb47 100644 --- a/test/util/concrete/ChildOrderBookV4ArbOrderTaker.sol +++ b/test/util/concrete/ChildOrderBookV4ArbOrderTaker.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 { diff --git a/test/util/concrete/FlashLendingMockOrderBook.sol b/test/util/concrete/FlashLendingMockOrderBook.sol index c19e35078..6671a0add 100644 --- a/test/util/concrete/FlashLendingMockOrderBook.sol +++ b/test/util/concrete/FlashLendingMockOrderBook.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 { diff --git a/test/util/concrete/Reenteroor.sol b/test/util/concrete/Reenteroor.sol index d73e1ac39..f4bd38536 100644 --- a/test/util/concrete/Reenteroor.sol +++ b/test/util/concrete/Reenteroor.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 {Address} from "openzeppelin-contracts/contracts/utils/Address.sol"; diff --git a/test/util/concrete/Refundoor.sol b/test/util/concrete/Refundoor.sol index ffd5aa672..d9087357b 100644 --- a/test/util/concrete/Refundoor.sol +++ b/test/util/concrete/Refundoor.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 "openzeppelin-contracts/contracts/utils/Address.sol"; diff --git a/test/util/fixture/LibOrderBookSubParserContextFixture.sol b/test/util/fixture/LibOrderBookSubParserContextFixture.sol index 183f95af5..a19c1b7c1 100644 --- a/test/util/fixture/LibOrderBookSubParserContextFixture.sol +++ b/test/util/fixture/LibOrderBookSubParserContextFixture.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 { diff --git a/test/util/lib/LibTestAddOrder.sol b/test/util/lib/LibTestAddOrder.sol index 307859c18..5a4d20e46 100644 --- a/test/util/lib/LibTestAddOrder.sol +++ b/test/util/lib/LibTestAddOrder.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 {META_MAGIC_NUMBER_V1} from "rain.metadata/lib/LibMeta.sol"; diff --git a/test/util/lib/LibTestConstants.sol b/test/util/lib/LibTestConstants.sol index f6c076ae7..c08a8d4f9 100644 --- a/test/util/lib/LibTestConstants.sol +++ b/test/util/lib/LibTestConstants.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; /// @dev Mocks need to be etched with some bytecode or they cannot even be