add ganache, spdx, minor code changes

This commit is contained in:
Moon Man 2023-01-29 13:29:54 -05:00
parent 20c37460bf
commit a928746060
13 changed files with 46 additions and 21 deletions

1
.gitignore vendored
View File

@ -1 +1,2 @@
node_modules
build

View File

@ -1,4 +1,5 @@
pragma solidity ^0.5.0;
// SPDX-License-Identifier: AGPL-3.0-or-later
pragma solidity ^0.8.17;
/**

View File

@ -1,4 +1,5 @@
pragma solidity ^0.5.0;
// SPDX-License-Identifier: AGPL-3.0-or-later
pragma solidity ^0.8.17;
/**
Note: Simple contract to use as base for const vals

View File

@ -1,4 +1,5 @@
pragma solidity ^0.5.0;
// SPDX-License-Identifier: AGPL-3.0-or-later
pragma solidity ^0.8.17;
import "./ERC1155.sol";
import "./ICurio.sol";
@ -30,7 +31,7 @@ contract CurioERC1155Wrapper is ERC1155, ERC1155Metadata_URI {
emit URI(_uri, _id);
}
constructor() public {
constructor() {
create(1, 0x6Aa2044C7A0f9e2758EdAE97247B03a0D7e73d6c, "ipfs://QmWHUnrdfA4w89TeepZqrvygbaF9wV48k97Wf27skL5cry");
create(2, 0xE9A6A26598B05dB855483fF5eCc5f1d0C81140c8, "ipfs://QmVJn6B289Xt3cq9evzubdyk4f1usPAu277SmUusmdYYWU");
create(3, 0x3f8131B6E62472CEea9cb8Aa67d87425248a3702, "ipfs://QmWBb6T4nviPWdAyqGJTki7VA6fpTmcYP37U9jpYAfhzPP");

View File

@ -1,4 +1,5 @@
pragma solidity ^0.5.0;
// SPDX-License-Identifier: AGPL-3.0-or-later
pragma solidity ^0.8.17;
import "./SafeMath.sol";
import "./Address.sol";
@ -37,7 +38,7 @@ contract ERC1155 is IERC1155, ERC165, CommonConstants
function supportsInterface(bytes4 _interfaceId)
public
view
pure
returns (bool) {
if (_interfaceId == INTERFACE_SIGNATURE_ERC165 ||
_interfaceId == INTERFACE_SIGNATURE_ERC1155) {

View File

@ -1,4 +1,5 @@
pragma solidity ^0.5.0;
// SPDX-License-Identifier: AGPL-3.0-or-later
pragma solidity ^0.8.17;
/**

View File

@ -1,4 +1,5 @@
pragma solidity ^0.5.0;
// SPDX-License-Identifier: AGPL-3.0-or-later
pragma solidity ^0.8.17;
// Curio is not quite ERC-20 compliant
interface ICurio {

View File

@ -1,4 +1,5 @@
pragma solidity ^0.5.0;
// SPDX-License-Identifier: AGPL-3.0-or-later
pragma solidity ^0.8.17;
import "./ERC165.sol";

View File

@ -1,4 +1,5 @@
pragma solidity ^0.5.0;
// SPDX-License-Identifier: AGPL-3.0-or-later
pragma solidity ^0.8.17;
/**
Note: The ERC-165 identifier for this interface is 0x0e89341c.

View File

@ -1,4 +1,5 @@
pragma solidity ^0.5.0;
// SPDX-License-Identifier: AGPL-3.0-or-later
pragma solidity ^0.8.17;
/**
Note: The ERC-165 identifier for this interface is 0x4e2312e0.

View File

@ -1,4 +1,5 @@
pragma solidity ^0.5.0;
// SPDX-License-Identifier: AGPL-3.0-or-later
pragma solidity ^0.8.17;
/**

27
package-lock.json generated
View File

@ -10,6 +10,7 @@
"license": "ISC",
"devDependencies": {
"@truffle/hdwallet-provider": "^1.7.0",
"ganache": "^7.7.3",
"truffle": "^5.7.4"
}
},
@ -4236,6 +4237,7 @@
"resolved": "https://registry.npmjs.org/emittery/-/emittery-0.4.1.tgz",
"integrity": "sha512-r4eRSeStEGf6M5SKdrQhhLK5bOwOBxQhIE3YSTnZE3GpKiLfnnhE+tPtrJE79+eDJgm39BM6LSoI8SCx4HbwlQ==",
"dev": true,
"optional": true,
"engines": {
"node": ">=6"
}
@ -5585,7 +5587,6 @@
"resolved": "https://registry.npmjs.org/bufferutil/-/bufferutil-4.0.5.tgz",
"integrity": "sha512-HTm14iMQKK2FjFLRTM5lAVcyaUzOnqbPtesFIvREgXpJHdQm8bWS+GkQgIkfaBYRHuCnea7w8UVNfwiAQhlr9A==",
"dev": true,
"hasInstallScript": true,
"optional": true,
"dependencies": {
"node-gyp-build": "^4.3.0"
@ -5943,7 +5944,6 @@
"resolved": "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.7.tgz",
"integrity": "sha512-vLt1O5Pp+flcArHGIyKEQq883nBt8nN8tVBcoL0qUXj2XT1n7p70yGIq2VK98I5FdZ1YHc0wk/koOnHjnXWk1Q==",
"dev": true,
"hasInstallScript": true,
"optional": true,
"dependencies": {
"node-gyp-build": "^4.3.0"
@ -7236,6 +7236,7 @@
"integrity": "sha512-iB8O/7Db9lPaITU1aA2txU/cBEXAt4vWwKQRrrWuS6XDgbP4QZGj9BL2aNbwb002atoQ/lIotJkfyzz+ygQnUQ==",
"dev": true,
"hasInstallScript": true,
"optional": true,
"dependencies": {
"abstract-leveldown": "~6.2.1",
"napi-macros": "~2.0.0",
@ -7250,6 +7251,7 @@
"resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-6.2.3.tgz",
"integrity": "sha512-BsLm5vFMRUrrLeCcRc+G0t2qOaTzpoJQLOubq2XM72eNpjF5UdU5o/5NvlNhx95XHcAvcl8OMXr4mlg/fRgUXQ==",
"dev": true,
"optional": true,
"dependencies": {
"buffer": "^5.5.0",
"immediate": "^3.2.3",
@ -7266,6 +7268,7 @@
"resolved": "https://registry.npmjs.org/level-concat-iterator/-/level-concat-iterator-2.0.1.tgz",
"integrity": "sha512-OTKKOqeav2QWcERMJR7IS9CUo1sHnke2C0gkSmcR7QuEtFNLLzHQAvnMw8ykvEcv0Qtkg0p7FOwP1v9e5Smdcw==",
"dev": true,
"optional": true,
"engines": {
"node": ">=6"
}
@ -7275,6 +7278,7 @@
"resolved": "https://registry.npmjs.org/level-supports/-/level-supports-1.0.1.tgz",
"integrity": "sha512-rXM7GYnW8gsl1vedTJIbzOrRv85c/2uCMpiiCzO2fndd06U/kUXEEU9evYn4zFggBOg36IsBW8LzqIpETwwQzg==",
"dev": true,
"optional": true,
"dependencies": {
"xtend": "^4.0.2"
},
@ -7287,6 +7291,7 @@
"resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.1.1.tgz",
"integrity": "sha512-dSq1xmcPDKPZ2EED2S6zw/b9NKsqzXRE6dVr8TVQnI3FJOTteUMuqF3Qqs6LZg+mLGYJWqQzMbIjMtJqTv87nQ==",
"dev": true,
"optional": true,
"bin": {
"node-gyp-build": "bin.js",
"node-gyp-build-optional": "optional.js",
@ -8001,7 +8006,8 @@
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/napi-macros/-/napi-macros-2.0.0.tgz",
"integrity": "sha512-A0xLykHtARfueITVDernsAWdtIMbOJgKgcluwENp3AlsKN/PloyO10HtmoqnFAQAcxPkgZN7wdfPfEd0zNGxbg==",
"dev": true
"dev": true,
"optional": true
},
"node_modules/negotiator": {
"version": "0.6.3",
@ -14822,7 +14828,8 @@
"version": "0.4.1",
"resolved": "https://registry.npmjs.org/emittery/-/emittery-0.4.1.tgz",
"integrity": "sha512-r4eRSeStEGf6M5SKdrQhhLK5bOwOBxQhIE3YSTnZE3GpKiLfnnhE+tPtrJE79+eDJgm39BM6LSoI8SCx4HbwlQ==",
"dev": true
"dev": true,
"optional": true
},
"emoji-regex": {
"version": "8.0.0",
@ -17253,6 +17260,7 @@
"resolved": "https://registry.npmjs.org/leveldown/-/leveldown-5.6.0.tgz",
"integrity": "sha512-iB8O/7Db9lPaITU1aA2txU/cBEXAt4vWwKQRrrWuS6XDgbP4QZGj9BL2aNbwb002atoQ/lIotJkfyzz+ygQnUQ==",
"dev": true,
"optional": true,
"requires": {
"abstract-leveldown": "~6.2.1",
"napi-macros": "~2.0.0",
@ -17264,6 +17272,7 @@
"resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-6.2.3.tgz",
"integrity": "sha512-BsLm5vFMRUrrLeCcRc+G0t2qOaTzpoJQLOubq2XM72eNpjF5UdU5o/5NvlNhx95XHcAvcl8OMXr4mlg/fRgUXQ==",
"dev": true,
"optional": true,
"requires": {
"buffer": "^5.5.0",
"immediate": "^3.2.3",
@ -17276,13 +17285,15 @@
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/level-concat-iterator/-/level-concat-iterator-2.0.1.tgz",
"integrity": "sha512-OTKKOqeav2QWcERMJR7IS9CUo1sHnke2C0gkSmcR7QuEtFNLLzHQAvnMw8ykvEcv0Qtkg0p7FOwP1v9e5Smdcw==",
"dev": true
"dev": true,
"optional": true
},
"level-supports": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/level-supports/-/level-supports-1.0.1.tgz",
"integrity": "sha512-rXM7GYnW8gsl1vedTJIbzOrRv85c/2uCMpiiCzO2fndd06U/kUXEEU9evYn4zFggBOg36IsBW8LzqIpETwwQzg==",
"dev": true,
"optional": true,
"requires": {
"xtend": "^4.0.2"
}
@ -17291,7 +17302,8 @@
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.1.1.tgz",
"integrity": "sha512-dSq1xmcPDKPZ2EED2S6zw/b9NKsqzXRE6dVr8TVQnI3FJOTteUMuqF3Qqs6LZg+mLGYJWqQzMbIjMtJqTv87nQ==",
"dev": true
"dev": true,
"optional": true
}
}
},
@ -17858,7 +17870,8 @@
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/napi-macros/-/napi-macros-2.0.0.tgz",
"integrity": "sha512-A0xLykHtARfueITVDernsAWdtIMbOJgKgcluwENp3AlsKN/PloyO10HtmoqnFAQAcxPkgZN7wdfPfEd0zNGxbg==",
"dev": true
"dev": true,
"optional": true
},
"negotiator": {
"version": "0.6.3",

View File

@ -16,7 +16,8 @@
"author": "Moon",
"license": "ISC",
"devDependencies": {
"truffle": "^5.7.4",
"@truffle/hdwallet-provider": "^1.7.0"
"@truffle/hdwallet-provider": "^1.7.0",
"ganache": "^7.7.3",
"truffle": "^5.7.4"
}
}