From c36d5a50fe6e44635578d53577b8ac6693fac7ae Mon Sep 17 00:00:00 2001 From: 0age <0age@protonmail.com> Date: Wed, 23 Mar 2022 22:09:00 -0700 Subject: [PATCH] add LICENSE + update version to rc.0 --- LICENSE | 7 +++++++ README.md | 2 +- contracts/lib/ConsiderationBase.sol | 2 +- package.json | 6 +++--- test/index.js | 8 +++++--- 5 files changed, 17 insertions(+), 8 deletions(-) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 000000000..8d4b8ca3a --- /dev/null +++ b/LICENSE @@ -0,0 +1,7 @@ +Copyright 2022 Ozone Networks, Inc. + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/README.md b/README.md index bd5e749a9..4cef07f02 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ # Consideration -Consideration is a marketplace contract for safely and efficiently composing and fulfilling orders for ERC721 and ERC1155 items. Each order contains an arbitrary number of items that the offerer is willing to give (the "offer") along with an arbitrary number of items that must be received along with their respective receivers (the "consideration"). +Consideration is a marketplace contract for safely and efficiently creating and fulfilling orders for ERC721 and ERC1155 items. Each order contains an arbitrary number of items that the offerer is willing to give (the "offer") along with an arbitrary number of items that must be received along with their respective receivers (the "consideration"). ## Order diff --git a/contracts/lib/ConsiderationBase.sol b/contracts/lib/ConsiderationBase.sol index 4c1ca95d0..38a1aee51 100644 --- a/contracts/lib/ConsiderationBase.sol +++ b/contracts/lib/ConsiderationBase.sol @@ -20,7 +20,7 @@ import { OrderStatus } from "./ConsiderationStructs.sol"; contract ConsiderationBase is ConsiderationEventsAndErrors { // Declare constants for name, version, and reentrancy sentinel values. string internal constant _NAME = "Consideration"; - string internal constant _VERSION = "1"; + string internal constant _VERSION = "rc.0"; uint256 internal constant _NOT_ENTERED = 1; uint256 internal constant _ENTERED = 2; diff --git a/package.json b/package.json index 2b151fd13..f5886cfbd 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { "name": "consideration", - "version": "0.0.1", - "description": "Cheaply and safely offer ERC20, ERC721, and ERC1155 tokens and receive them in consideration.", - "main": "index.js", + "version": "rc.0", + "description": "Consideration is a marketplace contract for safely and efficiently creating and fulfilling orders for ERC721 and ERC1155 items. Each order contains an arbitrary number of items that the offerer is willing to give (the \"offer\") along with an arbitrary number of items that must be received along with their respective receivers (the \"consideration\").", + "main": "contracts/Consideration.sol", "author": "0age", "license": "MIT", "private": true, diff --git a/test/index.js b/test/index.js index 3b6f500b2..b7f932332 100644 --- a/test/index.js +++ b/test/index.js @@ -11,7 +11,9 @@ const { merkleTree } = require("./utils/criteria"); const { eip712DomainType } = require("../eip-712-types/domain"); const { orderType } = require("../eip-712-types/order"); -describe("Consideration functional tests", function () { +const VERSION = "rc.0"; + +describe(`Consideration (version: ${VERSION}) — initial test suite`, function () { const provider = ethers.provider; let chainId; let marketplaceContract; @@ -986,7 +988,7 @@ describe("Consideration functional tests", function () { // Required for EIP712 signing domainData = { name: "Consideration", - version: "1", + version: VERSION, chainId: chainId, verifyingContract: marketplaceContract.address, }; @@ -1214,7 +1216,7 @@ describe("Consideration functional tests", function () { }); it("gets correct version", async () => { const version = await marketplaceContract.version(); - expect(version).to.equal("1"); + expect(version).to.equal(VERSION); }); it("gets correct domain separator", async () => { const name = await marketplaceContract.name();