diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..e5cccb3 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,8 @@ +# CHANGELOG + +## v1.0.0-beta-rc1 + +This is the first release of the Story Protocol Gateway + +- Adds the SPG, a convenient wrapper around the core contracts for registration +- Includes NFT minting management tooling for registering and minting in one-shot diff --git a/deploy-out/deployment-11155111.json b/deploy-out/deployment-11155111.json index 809af42..fe008c6 100644 --- a/deploy-out/deployment-11155111.json +++ b/deploy-out/deployment-11155111.json @@ -1,7 +1,7 @@ { "main": { - "MetadataProviderImpl": "0x00C77FbBa266623964E5382580F503B3579D4214", - "SPG": "0x5a12E3F0DAeF58d493fa4c5a462e8cEB7b15cF28", - "SPNFTImpl": "0x8356f4e7888436d0fCa644c0E922C0880961d42A" + "MetadataProviderImpl": "0x79F8BDE6Bbe657ee31efe7B092c66A775c79Cd27", + "SPG": "0xf82EEe73c2c81D14DF9bC29DC154dD3c079d80a0", + "SPNFTImpl": "0x79F8BDE6Bbe657ee31efe7B092c66A775c79Cd27" } -} \ No newline at end of file +} diff --git a/package.json b/package.json index d9eee92..bca47e5 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { - "name": "solidity-template", - "version": "1.0.0", - "description": "", - "main": "index.js", + "name": "@story-protocol/protocol-periphery", + "version": "v1.0.0-beta-rc1", + "description": "Story Protocol periphery smart contracts", + "main": "", "directories": { "lib": "lib", "test": "test" @@ -14,7 +14,7 @@ "test": "npx hardhat test" }, "author": "StoryProtocol", - "license": "MIT", + "license": "BUSL-1.1", "devDependencies": { "chai": "^4.3.7", "dotenv": "^16.0.3", @@ -34,7 +34,6 @@ "dependencies": { "@openzeppelin/contracts": "5.0.1", "@openzeppelin/contracts-upgradeable": "5.0.1", - "@storyprotocol/contracts": "https://github.com/storyprotocol/protocol-core#v1.0.0-beta" - + "@story-protocol/protocol-core": "1.0.0-beta-rc6" } } diff --git a/remappings.txt b/remappings.txt index 4e67a17..fbae703 100644 --- a/remappings.txt +++ b/remappings.txt @@ -1,7 +1,7 @@ @ensdomains/=node_modules/@ensdomains/ @ethereum-waffle/=node_modules/@ethereum-waffle/ @openzeppelin/=node_modules/@openzeppelin/ -@storyprotocol/=node_modules/@storyprotocol/contracts/ +@storyprotocol/=node_modules/@story-protocol/protocol-core/ @storyprotocol-old/=node_modules/@storyprotocol/contracts-old/ ds-test/=lib/forge-std/lib/ds-test/src/ forge-std/=lib/forge-std/src/ diff --git a/script/utils/StoryProtocolCoreAddressManager.sol b/script/utils/StoryProtocolCoreAddressManager.sol index f022467..5f984ac 100644 --- a/script/utils/StoryProtocolCoreAddressManager.sol +++ b/script/utils/StoryProtocolCoreAddressManager.sol @@ -19,7 +19,7 @@ contract StoryProtocolCoreAddressManager is Script { function _readStoryProtocolCoreAddresses() internal { string memory root = vm.projectRoot(); - string memory path = string.concat(root, "/node_modules/@storyprotocol/contracts/deploy-out/deployment-11155111.json"); + string memory path = string.concat(root, "/node_modules/@story-protocol/protocol-core/deploy-out/deployment-11155111.json"); string memory json = vm.readFile(path); GOVERNANCE = json.readAddress(".main.Governance"); ipAssetRegistryAddr = json.readAddress(".main.IPAssetRegistry"); diff --git a/test/utils/Fork.t.sol b/test/utils/Fork.t.sol index a90993c..183f37e 100644 --- a/test/utils/Fork.t.sol +++ b/test/utils/Fork.t.sol @@ -10,7 +10,7 @@ contract ForkTest is BaseTest { uint256 sepoliaFork; // List of chain RPC URLs. - string SEPOLIA_RPC_URL = vm.envString("SEPOLIA_RPC_URL"); + string SEPOLIA_RPC_URL = vm.envString("SEPOLIA_URL"); /// @notice Sets up the base test contract. function setUp() public virtual override(BaseTest) { diff --git a/yarn-error.log b/yarn-error.log new file mode 100644 index 0000000..6417be5 --- /dev/null +++ b/yarn-error.log @@ -0,0 +1,75 @@ +Arguments: + /Users/leeren/.nvm/versions/node/v18.0.0/bin/node /Users/leeren/.nvm/versions/node/v18.0.0/bin/yarn add @story-protocol/protocol-core + +PATH: + /Users/leeren/.local/bin:/Users/leeren/.nvm/versions/node/v18.0.0/bin:/Users/leeren/.local/bin:/Users/leeren/.cargo/bin:/usr/local/mysql/bin:/usr/local/bin:/Users/leeren/Library/Python/3.8/bin:/usr/local/bin:/System/Cryptexes/App/usr/bin:/usr/bin:/bin:/usr/sbin:/sbin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/local/bin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/bin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/appleinternal/bin:/Library/Apple/usr/bin:/usr/local/go/bin://Users/leeren/go/bin:/Users/leeren/.foundry/bin:/Users/leeren/google-cloud-sdk/bin://Users/leeren/go/bin:/Users/leeren/.foundry/bin:/Users/leeren/google-cloud-sdk/bin + +Yarn version: + 1.22.19 + +Node version: + 18.0.0 + +Platform: + darwin x64 + +Trace: + Error: https://registry.npmjs.org/@storyprotocol%2fprotocol-core: Not found + at params.callback [as _callback] (/Users/leeren/.nvm/versions/node/v18.0.0/lib/node_modules/yarn/lib/cli.js:66145:18) + at self.callback (/Users/leeren/.nvm/versions/node/v18.0.0/lib/node_modules/yarn/lib/cli.js:140890:22) + at Request.emit (node:events:527:28) + at Request. (/Users/leeren/.nvm/versions/node/v18.0.0/lib/node_modules/yarn/lib/cli.js:141862:10) + at Request.emit (node:events:527:28) + at IncomingMessage. (/Users/leeren/.nvm/versions/node/v18.0.0/lib/node_modules/yarn/lib/cli.js:141784:12) + at Object.onceWrapper (node:events:641:28) + at IncomingMessage.emit (node:events:539:35) + at endReadableNT (node:internal/streams/readable:1344:12) + at process.processTicksAndRejections (node:internal/process/task_queues:82:21) + +npm manifest: + { + "name": "@story-protocol/protocol-periphery", + "version": "v1.0.0-beta-rc1", + "description": "Story Protocol periphery smart contracts", + "main": "", + "directories": { + "lib": "lib", + "test": "test" + }, + "scripts": { + "lint": "npm run lint:solidity && npm run lint:javascript", + "lint:javascript": "eslint ./", + "lint:solidity": "solhint \"contracts/**/*.sol\" \"test/**/*.sol\"", + "test": "npx hardhat test" + }, + "author": "StoryProtocol", + "license": "MIT", + "devDependencies": { + "chai": "^4.3.7", + "dotenv": "^16.0.3", + "eslint": "^8.38.0", + "eslint-plugin-prettier": "^4.2.1", + "ethereum-waffle": "^4.0.10", + "ethers": "^6.10.0", + "mocha": "^10.2.0", + "prettier": "2.8.7", + "prettier-plugin-solidity": "^1.1.3", + "solhint": "^3.4.1", + "solhint-plugin-prettier": "^0.0.5", + "solidity-coverage": "^0.8.2", + "ts-node": "^10.9.2", + "typechain": "^8.3.2" + }, + "dependencies": { + "@openzeppelin/contracts": "5.0.1", + "@openzeppelin/contracts-upgradeable": "5.0.1", + "@storyprotocol/protocol-core": "1.0.0-beta-rc6" + + } + } + +yarn manifest: + No manifest + +Lockfile: + No lockfile diff --git a/yarn.lock b/yarn.lock index 71b368d..b2b23f0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -621,9 +621,10 @@ resolved "https://registry.yarnpkg.com/@solidity-parser/parser/-/parser-0.18.0.tgz#8e77a02a09ecce957255a2f48c9a7178ec191908" integrity sha512-yfORGUIPgLck41qyN7nbwJRAx17/jAIXCTanHOJZhB6PJ1iAk/84b/xlsVKFSyNyLXIj0dhppoE0+CRws7wlzA== -"@storyprotocol/contracts@https://github.com/storyprotocol/protocol-core#beta-rc5": - version "0.3.0" - resolved "https://github.com/storyprotocol/protocol-core#c84d0a68f9bac17ce7b7b12ccfccd2fc5e49d0c8" +"@story-protocol/protocol-core@1.0.0-beta-rc6": + version "1.0.0-beta-rc6" + resolved "https://registry.yarnpkg.com/@story-protocol/protocol-core/-/protocol-core-1.0.0-beta-rc6.tgz#be833ae95419340816c6f246c40654d0e8a649c0" + integrity sha512-2diMjDOpFuKcKZ7BQTdR0jb/W3Etob3cPkewteZvXgYwpLd0MpwPDkujPOM7KijYlp781kDx0ay8TqutgqH5QQ== dependencies: "@openzeppelin/contracts" "5.0.1" "@openzeppelin/contracts-upgradeable" "5.0.1"