Skip to content

feat(sharing): Deploy using testnets deployer #445

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.

Sign up for GitHub

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

Merged
zguesmi merged 20 commits into from
May 19, 2025
Merged

feat(sharing): Deploy using testnets deployer #445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
6b5e963
Use correct testnet deployer wallet
zguesmi May 16, 2025
784c034
Clean old deployment
zguesmi May 16, 2025
2072539
Change salt & log deployer
zguesmi May 16, 2025
13c7cb6
chore: save deployment artifacts for arbitrumSepolia (testnets, 15073…
github-actions[bot] May 16, 2025
dd9d371
Fix env variables config
zguesmi May 19, 2025
3b59801
Update create 2 salt
zguesmi May 19, 2025
b024f97
Clean old deployment
zguesmi May 19, 2025
e703ade
Debug contracts verification
zguesmi May 19, 2025
e652bb2
Debug contracts verification
zguesmi May 19, 2025
6f9aa03
Debug contracts verification
zguesmi May 19, 2025
182c4ed
Debug contracts verification
zguesmi May 19, 2025
46a34f3
chore: save deployment artifacts for arbitrumSepolia (testnets, 15114…
github-actions[bot] May 19, 2025
6b47a27
Debug contracts verification
zguesmi May 19, 2025
3c8edf1
chore: save deployment artifacts for arbitrumSepolia (testnets, 15114…
github-actions[bot] May 19, 2025
eaf54f4
Debug contracts verification
zguesmi May 19, 2025
802f47f
Clean
zguesmi May 19, 2025
eba6f49
Set final salt
zguesmi May 19, 2025
2660264
Reset deployments
zguesmi May 19, 2025
8a62021
chore: save deployment artifacts for arbitrumSepolia (testnets, 15116…
github-actions[bot] May 19, 2025
a9d39fd
Update changelog
zguesmi May 19, 2025
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
6 changes: 3 additions & 3 deletions .github/workflows/sharing-smart-contract-deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@ jobs:
if [ "${{ inputs.network }}" == "arbitrumSepolia" ]; then
echo "POCO_ADDRESS=0x14B465079537655E1662F012e99EBa3863c8B9E0" >> $GITHUB_ENV
echo "DATASET_REGISTRY_ADDRESS=0x3441A0C9FE488c51fcABa2bAAA048720f4D4F72D" >> $GITHUB_ENV
echo "ARBISCAN_API_KEY=${{ secrets.ARBISCAN_API_KEY }}" >> $GITHUB_ENV
echo "ETHERSCAN_API_KEY=${{ secrets.ETHERSCAN_API_KEY }}" >> $GITHUB_ENV
echo "DEPLOYMENT_ID=chain-421614" >> $GITHUB_ENV
fi

- uses: actions/checkout@v4
Expand Down Expand Up @@ -101,7 +102,6 @@ jobs:
commit_user_email: 'github-actions[bot]@users.noreply.github.com'
commit_author: 'GitHub Actions Bot <github-actions[bot]@users.noreply.github.com>'

# TODO
- name: Verify contracts
working-directory: packages/sharing-smart-contract
run: echo "Verify contracts" # npm run verify:ignition -- <deploymentId>
run: echo "TODO" # npm run verify:ignition -- $DEPLOYMENT_ID
Comment on lines 105 to +107
Copy link
Contributor

@Le-Caignec Le-Caignec May 19, 2025

Choose a reason for hiding this comment

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

This step could be removed to be merged with the deployment step

Copy link
Contributor

@Le-Caignec Le-Caignec May 19, 2025

Choose a reason for hiding this comment

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

npm run deploy -- --network ${{ inputs.network }} --verify

Copy link
Member Author

@zguesmi zguesmi May 19, 2025

Choose a reason for hiding this comment

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

Yes we can discuss that in the next steps.

10 changes: 5 additions & 5 deletions packages/sharing-smart-contract/.openzeppelin/unknown-421614.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@
"manifestVersion": "3.2",
"proxies": [
{
"address": "0x636bDecb02390064bb938760473d76FfB47c4FDa",
"address": "0x9902e2F89DCC4dcCb75805096Ead2e58Fc389b7D",
"kind": "transparent"
},
{
"address": "0xD754A70f2174674A8FF0fa41BCAAe310D26dbEaA",
"address": "0x2485Ed90d4566516298B7D01462df8d1A41E13AE",
"kind": "transparent"
}
],
"impls": {
"a8715b6ebae5c408bf687445be9061c544bc405b8b556bcfce0b94dc04009ebb": {
"address": "0xd617e6772DE4B66257292FF299227d9D2eB5d7E8",
"address": "0x31FA12A2B8067e7aca306A507CC706ac80b2d20e",
"layout": {
"solcVersion": "0.8.24",
"storage": [
Expand Down Expand Up @@ -199,8 +199,8 @@
}
}
},
"6a970f037904f927c4aee3f9cd63a53166c7aaacbb8e71111924c35fe10c644d": {
"address": "0x74ACB9B3493fCC2308cb701d547a4b460f1Ad861",
"79c23ed7636921573eb8c93e5c1add5695ee9342b5060e87cbf2b4b9356dd8be": {
"address": "0x2FBDcc656607389B9D87966F10aFC6Fd94130cAb",
"layout": {
"solcVersion": "0.8.24",
"storage": [
Expand Down
2 changes: 1 addition & 1 deletion packages/sharing-smart-contract/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ All notable changes to this project will be documented in this file.

### Changed

- Deploy on testnet and save artifacts (#444)
- Deploy on testnet and save artifacts (#444, #445)
- Deploy DPS contract using Github action (#443)
- Refactor sharing contract CI to use reusable workflows (#442)
- Import Ignition deployment in OZ upgrades plugin (#441)
Expand Down
2 changes: 1 addition & 1 deletion packages/sharing-smart-contract/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ npm run verify -- <address> --network <name>

## Docs and diagrams

#### UML Diagrams
#### UML diagrams

To generate UML diagrams for smart contracts (storage + class):

Expand Down
6 changes: 3 additions & 3 deletions packages/sharing-smart-contract/config/env.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ const envSchema = z.object({
.string()
.url('ARBITRUM_SEPOLIA_RPC_URL must be a valid URL')
.optional(),

ETHERSCAN_API_KEY: z.string().optional(),
});

module.exports = {
env: envSchema.parse(process.env),
};
module.exports = envSchema.parse(process.env);
4 changes: 2 additions & 2 deletions packages/sharing-smart-contract/config/env.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
import _env from './env.cjs';
import env from './env.cjs';

export const env = _env.env;
export default env;
6 changes: 3 additions & 3 deletions packages/sharing-smart-contract/hardhat.config.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ module.exports = {
chainId: 421614,
url: env.ARBITRUM_SEPOLIA_RPC_URL || 'https://sepolia-rollup.arbitrum.io/rpc',
accounts: [
process.env.PRIVATE_KEY ||
env.PRIVATE_KEY ||
'0x0000000000000000000000000000000000000000000000000000000000000000',
],
blockGasLimit: 30_000_000,
Expand All @@ -74,7 +74,7 @@ module.exports = {
apiKey: {
bellecour: 'nothing', // a non-empty string is needed by the plugin.
avalancheFujiTestnet: 'nothing', // a non-empty string is needed by the plugin.
arbitrumSepolia: process.env.ETHERSCAN_API_KEY || '',
arbitrumSepolia: env.ETHERSCAN_API_KEY || '',
},
customChains: [
{
Expand Down Expand Up @@ -111,7 +111,7 @@ module.exports = {
ignition: {
strategyConfig: {
create2: {
salt: "0x0000000000000000000000000000000000000000000000000000000000000000",
salt: "0x0000000000000000000000000000000000000000000000000000000000000001",
},
},
},
Expand Down
12 changes: 6 additions & 6 deletions packages/sharing-smart-contract/ignition/deployments/chain-421614/deployed_addresses.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"DataProtectorSharingModule#AddOnlyAppWhitelistRegistryImpl": "0xd617e6772DE4B66257292FF299227d9D2eB5d7E8",
"DataProtectorSharingModule#AddOnlyAppWhitelistRegistryProxy": "0x636bDecb02390064bb938760473d76FfB47c4FDa",
"DataProtectorSharingModule#AddOnlyAppWhitelistRegistry": "0x636bDecb02390064bb938760473d76FfB47c4FDa",
"DataProtectorSharingModule#DataProtectorSharingImpl": "0x74ACB9B3493fCC2308cb701d547a4b460f1Ad861",
"DataProtectorSharingModule#DataProtectorSharingProxy": "0xD754A70f2174674A8FF0fa41BCAAe310D26dbEaA",
"DataProtectorSharingModule#DataProtectorSharing": "0xD754A70f2174674A8FF0fa41BCAAe310D26dbEaA"
"DataProtectorSharingModule#AddOnlyAppWhitelistRegistryImpl": "0x31FA12A2B8067e7aca306A507CC706ac80b2d20e",
"DataProtectorSharingModule#AddOnlyAppWhitelistRegistryProxy": "0x9902e2F89DCC4dcCb75805096Ead2e58Fc389b7D",
"DataProtectorSharingModule#AddOnlyAppWhitelistRegistry": "0x9902e2F89DCC4dcCb75805096Ead2e58Fc389b7D",
"DataProtectorSharingModule#DataProtectorSharingImpl": "0x2FBDcc656607389B9D87966F10aFC6Fd94130cAb",
"DataProtectorSharingModule#DataProtectorSharingProxy": "0x2485Ed90d4566516298B7D01462df8d1A41E13AE",
"DataProtectorSharingModule#DataProtectorSharing": "0x2485Ed90d4566516298B7D01462df8d1A41E13AE"
}
Loading
Loading