Skip to content

Commit

Permalink
Merge branch 'develop' into guardianRecovery
Browse files Browse the repository at this point in the history
  • Loading branch information
CJ42 authored Jul 29, 2024
2 parents 5218531 + 5d77d2e commit 04c1b3d
Show file tree
Hide file tree
Showing 125 changed files with 2,907 additions and 1,270 deletions.
21 changes: 5 additions & 16 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 Down Expand Up @@ -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 }}
12 changes: 7 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ permissions:
jobs:
release-please:
runs-on: ubuntu-latest
environment: publish
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_PUBLISH_KEY }}

steps:
- uses: google-github-actions/release-please-action@v3
id: release
Expand All @@ -30,11 +34,11 @@ jobs:
- uses: actions/checkout@v3
if: ${{ steps.release.outputs.releases_created }}

- name: Use Node.js '16.15.0'
uses: actions/setup-node@v2
- name: Use Node.js v20
uses: actions/setup-node@v4
if: ${{ steps.release.outputs.releases_created }}
with:
node-version: "16.15.0"
node-version: "20.x"
registry-url: "https://registry.npmjs.org"
scope: "@lukso"
cache: "npm"
Expand All @@ -61,5 +65,3 @@ jobs:
END
)
node ./publish.mjs outputs.json
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_PUBLISH_KEY }}
3 changes: 3 additions & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
//registry.npmjs.org/:_authToken=${NODE_AUTH_TOKEN}
registry=https://registry.npmjs.org/
always-auth=true
23 changes: 22 additions & 1 deletion .release-please-manifest.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,24 @@
{
".": "0.14.0"
"packages/lsp-smart-contracts": "0.15.0-rc.0",
"packages/lsp0-contracts": "0.15.0-rc.0",
"packages/lsp1-contracts": "0.15.0-rc.0",
"packages/lsp1delegate-contracts": "0.15.0-rc.0",
"packages/lsp2-contracts": "0.15.0-rc.0",
"packages/lsp3-contracts": "0.15.0-rc.0",
"packages/lsp4-contracts": "0.15.0-rc.0",
"packages/lsp5-contracts": "0.15.0-rc.0",
"packages/lsp6-contracts": "0.15.0-rc.0",
"packages/lsp7-contracts": "0.15.0-rc.0",
"packages/lsp8-contracts": "0.15.0-rc.0",
"packages/lsp9-contracts": "0.15.0-rc.0",
"packages/lsp10-contracts": "0.15.0-rc.0",
"packages/lsp12-contracts": "0.15.0-rc.0",
"packages/lsp14-contracts": "0.15.0-rc.0",
"packages/lsp16-contracts": "0.15.0-rc.0",
"packages/lsp17-contracts": "0.15.0-rc.0",
"packages/lsp17contractextension-contracts": "0.15.0-rc.0",
"packages/lsp20-contracts": "0.15.0-rc.0",
"packages/lsp23-contracts": "0.15.0-rc.0",
"packages/lsp25-contracts": "0.15.0-rc.0",
"packages/universalprofile-contracts": "0.15.0-rc.0"
}
3 changes: 0 additions & 3 deletions config/tsconfig/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@
"version": "0.0.0",
"private": true,
"license": "Apache-2.0",
"publishConfig": {
"access": "public"
},
"files": [
"contracts.json",
"contracts.module.json"
Expand Down
Loading

0 comments on commit 04c1b3d

Please sign in to comment.