Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor!: Remove Core contracts from LSP7 and LSP8 + use latest @erc725/smart-contracts to remove dependency with OwnableUnset #974

Merged
merged 26 commits into from
Oct 23, 2024

Conversation

CJ42
Copy link
Member

@CJ42 CJ42 commented Sep 3, 2024

What does this PR introduce?

PR Checklist

  • Wrote Tests
  • Wrote & Generated Documentation (readme/natspec/dodoc)
  • Ran npm run lint && npm run lint:solidity (solhint)
  • Ran npm run format (prettier)
  • Ran npm run build
  • Ran npm run test

@CJ42 CJ42 force-pushed the refactor/lsp7-with-erc725-v8 branch from 452c1d2 to e3b5539 Compare September 4, 2024 10:23
@CJ42 CJ42 marked this pull request as ready for review September 6, 2024 01:59
packages/lsp4-contracts/package.json Outdated Show resolved Hide resolved
@@ -46,7 +46,7 @@
"lint:solidity": "solhint 'contracts/**/*.sol' && prettier --check 'contracts/**/*.sol'"
},
"dependencies": {
"@erc725/smart-contracts": "^7.0.0",
"@erc725/smart-contracts-v8": "file:erc725-smart-contracts-v8-rc0.tgz",
"@lukso/lsp2-contracts": "*"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"@lukso/lsp2-contracts": "*"
"@lukso/lsp2-contracts": "~0.15.0"

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good call

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the problem we have between develop and main:

  • main has version number
  • develop has placeholders.

This will all be changed to version numbers soon.

"@openzeppelin/contracts": "^4.9.6",
"@lukso/lsp1-contracts": "~0.15.0",
"@lukso/lsp2-contracts": "~0.15.0",
"@lukso/lsp4-contracts": "*",
"@lukso/lsp17contractextension-contracts": "*"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do some packages have "~0.15.0" and other "*"?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See my comment above: #974 (comment)

packages/lsp7-contracts/package.json Outdated Show resolved Hide resolved
packages/lsp8-contracts/package.json Outdated Show resolved Hide resolved
"@erc725/smart-contracts-v8": "file:erc725-smart-contracts-v8-rc0.tgz",
"@openzeppelin/contracts": "^4.9.6",
"@lukso/lsp1-contracts": "~0.15.0",
"@lukso/lsp2-contracts": "~0.15.0",
"@lukso/lsp4-contracts": "*",
"@lukso/lsp17contractextension-contracts": "*"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same question regarding versioning

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same answer as above

packages/lsp11-contracts/package.json Show resolved Hide resolved
packages/lsp17-contracts/package.json Outdated Show resolved Hide resolved
@@ -42,7 +42,6 @@
"lint:solidity": "solhint 'contracts/**/*.sol' && prettier --check 'contracts/**/*.sol'"
},
"dependencies": {
"@erc725/smart-contracts": "^7.0.0",
"@openzeppelin/contracts": "^4.9.3"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same question about package not being updated

packages/universalprofile-contracts/package.json Outdated Show resolved Hide resolved
@YamenMerhi
Copy link
Member

Since Core has been removed from ERC725, won't this affect as well LSP0 ?

@CJ42
Copy link
Member Author

CJ42 commented Oct 16, 2024

Since Core has been removed from ERC725, won't this affect as well LSP0 ?

@YamenMerhi

With the monorepo now, there is not really the concept of "affected packages" anymore. We are not subject anymore to the upgrasdes, and we have control over what we want to upgrade.

So in this PR, to keep it scoped, I only upgraded LSP4, 7 and 8 to have ER725 v8 that don't have the Core contracts anymore.

(I actually couldn't upgrade LSP0 because of linearization of inheritance graph impossible error.)

So we can basically decide to release LSP4, 7 and 8 as v0.16.0 without the need to have to upgrade LSP0 + everything else (LSP0 and the other packages are not a blocker anymore).

@CJ42 CJ42 merged commit 5b709dc into develop Oct 23, 2024
2 checks passed
@CJ42 CJ42 deleted the refactor/lsp7-with-erc725-v8 branch October 23, 2024 13:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

5 participants