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

Sync main with missing commits in develop #981

Draft
wants to merge 38 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
e99f909
feat!: add LSP11 package
YamenMerhi Mar 7, 2024
17906eb
Add suggested changes to LSP11
YamenMerhi Mar 26, 2024
2aaf59a
build: add lsp11 package-lick
YamenMerhi Mar 26, 2024
5c91caa
chore: resolve linter
YamenMerhi Mar 26, 2024
9e3d625
refactor: Add suggested changes
YamenMerhi Apr 2, 2024
60f98b8
build: update package-lock.json
YamenMerhi Apr 2, 2024
7ea78b7
refactor: add to LSP11 `getFirstRecoveryTimestampOf`
YamenMerhi Apr 28, 2024
05a072f
Allow contract assets
dzbo May 16, 2024
fed94f0
docs: fix broken links for solidity implementation
b00ste Jun 5, 2024
1720bc5
docs: updated docs grammars to improve readability
clarencepenz Feb 26, 2024
6262068
docs: updated docs grammars to improve readability
clarencepenz Feb 15, 2024
7cdfb0f
docs: updated docs grammars to improve readability
clarencepenz Feb 16, 2024
0d828ce
ci: use `tags` from hardhat deploy plugin to simplify deploy + verify…
CJ42 Jul 24, 2024
bc67dc5
feat: create deployment scripts for LSP23 + UP Post Deployment module
CJ42 Jul 4, 2024
0610633
chore: update mainnet RPC endpoint
CJ42 Jul 25, 2024
22025b0
chore: move `deploy/` scripts folder inside `lsp-smart-contract` pack…
CJ42 Jul 25, 2024
2e95a7c
docs: add LSP0 typeId for Value Received in Natspec comments for `Uni…
CJ42 Jul 25, 2024
d3f3e68
docs: update incorrect link for execute relay call guide
CJ42 Jul 29, 2024
41b94aa
feat: create and test `LSP26FollowingSystem`
b00ste Jul 3, 2024
ab63409
Update ILSP26FollowingSystem.sol
frozeman Jul 3, 2024
eabfac1
chore: interface & natspec updates
b00ste Jul 31, 2024
5f6483a
chore: update contracts, readme and tests
b00ste Aug 2, 2024
7dde4d2
build: specify version of packages in LSP26
YamenMerhi Aug 6, 2024
d9fccf0
build: select contract to keep artifacts
YamenMerhi Aug 6, 2024
bfbe2cd
build: add lsp26 to release please config
YamenMerhi Aug 6, 2024
b415315
test: Fix type id tests
b00ste Aug 8, 2024
eb7c977
chore: add missing interface ID for LSP26 in lsp-smart-contracts package
CJ42 Aug 9, 2024
9d126fd
refactor: Rename LSP26 to LSP26FollowerSystem
YamenMerhi Aug 20, 2024
6ae9514
Update benchmark CI
YamenMerhi Aug 20, 2024
c72a7be
refactor: Rename LSP26 in main lsp-smart-contract package (#969)
YamenMerhi Aug 21, 2024
752042b
test: add extreme case tests
b00ste Aug 22, 2024
1a00a83
feat: create script to deploy LSP26 Follower System
b00ste Aug 21, 2024
eac709e
fix: Repair node-versions to match everywhere.
richtera Aug 30, 2024
5955cf0
fix: disallow arbitrary sending of 0 amount in LSP7
YamenMerhi Sep 26, 2024
b0048bd
test: add necessary tests
YamenMerhi Sep 26, 2024
41a0411
Add contribute section in README.md
YamenMerhi Oct 3, 2024
3f66b73
Update CONTRIBUTING.md
YamenMerhi Oct 3, 2024
0bf23d4
Apply suggestions from code review
YamenMerhi Oct 10, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/benchmark.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ jobs:
ref: ${{ github.event.pull_request.base.sha }}
fetch-depth: 0

- name: Use Node.js '16.15.0'
uses: actions/setup-node@v2
- name: Use Node.js v20
uses: actions/setup-node@v4
with:
node-version: "16.15.0"
node-version: "20.x"
cache: "npm"

- name: 📦 Install dependencies
Expand All @@ -59,10 +59,10 @@ jobs:
with:
clean: false

- name: Use Node.js '16.15.0'
uses: actions/setup-node@v2
- name: Use Node.js '20.x'
uses: actions/setup-node@v4
with:
node-version: "16.15.0"
node-version: "20.x"
cache: "npm"

- name: 📦 Install dependencies
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-lint-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:

# See supported Node.js release schedule at https://nodejs.org/en/about/releases/
- name: Use Node.js v20
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: "20.x"
cache: "npm"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ jobs:
steps:
- uses: actions/checkout@v3

- name: Use Node.js v16
uses: actions/setup-node@v2
- name: Use Node.js v20.x
uses: actions/setup-node@v4
with:
node-version: "16.x"
node-version: "20.x"
cache: "npm"

- name: Install dependencies
Expand Down
23 changes: 6 additions & 17 deletions .github/workflows/deploy-verify.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This workflow deploys and verify the lsp-smart-contracts and verify them on LUKSO Testnet.
name: Deploy + Verify Contracts on Testnet
# This workflow deploys and verify the lsp-smart-contracts and verify them on LUKSO Mainnet & Testnet.
name: Deploy + Verify Contracts

env:
# 0x983aBC616f2442bAB7a917E6bb8660Df8b01F3bF
Expand All @@ -24,7 +24,7 @@ jobs:
- uses: actions/checkout@v3

- name: Use Node.js v20
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: "20.x"
cache: "npm"
Expand All @@ -38,21 +38,10 @@ jobs:
- name: Verify Deployer Balance
run: npx hardhat verify-balance --network ${{ matrix.network }}

# We do not deploy the standard contracts on mainnet for the following reasons:
# 1) standard contracts are expensive to deploy on mainnet
# 2) user's universal profiles use the minimal proxy pattern,
#
# therefore we only need the base contracts to be deployed on mainnet.
- name: Select tags based on network to deploy
run: |
TAGS="base"
if [[ ${{ matrix.network }} == "luksoTestnet"]]; then
TAGS+=",standard"
fi

- name: Deploy contracts on network
# The array of `tags` under each network in `hardhat.config.ts` specify which contracts to deploy
- name: Deploy contracts on ${{ matrix.network }}
run: npx hardhat deploy --network ${{ matrix.network }} --tags $TAGS --write true

# Loop through deployment files and recover address of deployed contracts to verify
- name: Verify deployed contracts on mainnet
- name: Verify deployed contracts on ${{ matrix.network }}
run: npx hardhat verify-all --network ${{ matrix.network }}
6 changes: 3 additions & 3 deletions .github/workflows/mythx-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ jobs:
steps:
- uses: actions/checkout@v3

- name: Setup Node.js '16.15.0'
uses: actions/setup-node@v2
- name: Setup Node.js '20.x'
uses: actions/setup-node@v4
with:
node-version: "16.15.0"
node-version: "20.x"
cache: "npm"

- name: Set up Python 3.8
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/solc_version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@ jobs:
steps:
- uses: actions/checkout@v3

- name: Use Node.js '16.15.0'
uses: actions/setup-node@v2
- name: Use Node.js '20.x'
uses: actions/setup-node@v4
with:
node-version: "16.15.0"
node-version: "20.x"
cache: "npm"

- name: 📦 Install dependencies
Expand Down
1 change: 1 addition & 0 deletions .release-please-manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,6 @@
"packages/lsp20-contracts": "0.15.0",
"packages/lsp23-contracts": "0.15.0",
"packages/lsp25-contracts": "0.15.0",
"packages/lsp26-contracts": "0.15.0",
"packages/universalprofile-contracts": "0.15.0"
}
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1 +1 @@
nodejs 16.19.0
nodejs 20
2 changes: 2 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ Since the `@lukso/lsp-smart-contracts` is an Open Source project, we welcome con
- report bug and issues.
- introduce new features or bug fixes.

Any non-trivial code contribution **must be first discussed with the maintainers and the developer community in an [issue](https://github.com/lukso-network/lsp-smart-contracts/issues/new/choose)**. Only very minor changes are accepted without prior discussion.

## **Clone project**

Our project uses submodules, we recommend you to clone our repository using the following command:
Expand Down
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,10 @@ The following audits and formal verification were conducted. All high-level issu
- MiloTruck, 2023-11-31, Final Result: [MiloTruck_audit_2023_11_31.pdf](./audits/MiloTruck_audit_2023_11_31.pdf)
- MiloTruck, 2024-01-24, Final Result: [MiloTruck_audit_2024_01_24.pdf](./audits/MiloTruck_audit_2024_01_24.pdf)

## Contribute

The implementation contracts of the [LSPs](https://github.com/lukso-network/LIPs) exist thanks to their contributors. There are many ways you can participate and help build high quality software. Check out the [contribution guidelines](./CONTRIBUTING.md)!

## Contributors ✨

Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):
Expand Down
2 changes: 1 addition & 1 deletion config/eslint-config-custom/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"@typescript-eslint/eslint-plugin": "^6.2.1",
"@typescript-eslint/parser": "^6.2.1",
"eslint-config-prettier": "^8.8.0",
"eslint-config-turbo": "^1.9.3",
"eslint-config-turbo": "^2.0.12",
"eslint-plugin-prettier": "^4.2.1"
}
}
5 changes: 5 additions & 0 deletions foundry.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@ src = 'packages/lsp2-contracts/contracts'
test = 'packages/lsp2-contracts/foundry'
out = 'packages/lsp2-contracts/contracts/foundry_artifacts'

[profile.lsp11]
src = 'packages/lsp11-contracts/contracts'
test = 'packages/lsp11-contracts/foundry'
out = 'packages/lsp11-contracts/contracts/foundry_artifacts'

[profile.lsp6]
src = 'packages/lsp6-contracts/contracts'
test = 'packages/lsp6-contracts/foundry'
Expand Down
Loading
Loading