Skip to content

Commit

Permalink
add LICENSE + update version to rc.0
Browse files Browse the repository at this point in the history
  • Loading branch information
0age committed Mar 24, 2022
1 parent c29bb52 commit c36d5a5
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 8 deletions.
7 changes: 7 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -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.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion contracts/lib/ConsiderationBase.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
8 changes: 5 additions & 3 deletions test/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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,
};
Expand Down Expand Up @@ -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();
Expand Down

0 comments on commit c36d5a5

Please sign in to comment.