Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
080b344
add usevoucher to processProtectedData
SeddikBellamine Mar 25, 2025
1ace242
fetchorders update
SeddikBellamine Mar 25, 2025
4c0e94d
format
SeddikBellamine Mar 25, 2025
ffc3b99
fix unit test
SeddikBellamine Mar 25, 2025
ff6c027
format
SeddikBellamine Mar 25, 2025
2733771
remove filterworkerpoolorders
SeddikBellamine Mar 25, 2025
31c342e
format
SeddikBellamine Mar 25, 2025
502f7f8
lint fix
SeddikBellamine Mar 25, 2025
fd67b7a
install [email protected]
SeddikBellamine Mar 25, 2025
2d342af
add VoucherAddress to processProtectedData
SeddikBellamine Mar 25, 2025
ac07f64
remove workerpool order from fetchOrdersUnderMaxPrice
SeddikBellamine Mar 26, 2025
4417b36
use filterworkerpoolorders
SeddikBellamine Mar 26, 2025
4881ca9
adjust unit tests
SeddikBellamine Mar 26, 2025
a997c96
remove unused import
SeddikBellamine Mar 26, 2025
a6e460f
fix unit tests
SeddikBellamine Mar 26, 2025
93decc8
resolvewithnoorder adjustement
SeddikBellamine Mar 26, 2025
4a9f66d
Feature/add use voucher to processprotecteddata (#421)
SeddikBellamine Mar 26, 2025
6460d36
feature/fix-processProtectedData-price-handling (#422)
Le-Caignec Apr 1, 2025
e67c49c
Merge remote-tracking branch 'origin/main' into develop
Le-Caignec Apr 4, 2025
70b75cb
ci: add GitHub Actions workflow for contract build and testing (#409)
TartanLeGrand Apr 7, 2025
0ae7a93
Add renovate.json
iexec-renovate-app[bot] Mar 10, 2025
ab16a99
ci(renovate): fix config
TartanLeGrand Mar 13, 2025
42e7a52
ci(ssc): add workflow for sharing smart contract tests (#408)
TartanLeGrand Apr 9, 2025
8f8c8a9
ci(deapp): add gitHub workflows for publishing and testing docker ima…
TartanLeGrand Apr 10, 2025
4e77272
Merge branch 'develop' into renovate/configure
abbesBenayache Apr 10, 2025
75029e1
ci: onboarding renovate (#403)
abbesBenayache Apr 10, 2025
c7f70ac
add default max desired price to config
SeddikBellamine Apr 14, 2025
b5f3d16
use promise.all to accelerate orders retrieval and add dataMaxPrice &…
SeddikBellamine Apr 14, 2025
4d6d258
use any if zero address is passed
SeddikBellamine Apr 14, 2025
26ce04f
adjust unit tests
SeddikBellamine Apr 14, 2025
93d9993
feature/update bas subgraph URL (#425)
Le-Caignec Apr 14, 2025
46968c2
Merge branch 'develop' into feature/update-processprotecteddata
SeddikBellamine Apr 14, 2025
0841d5a
Update packages/sdk/tests/unit/dataProtectorCore/processProtectedData…
SeddikBellamine Apr 15, 2025
2c5e125
Update packages/sdk/tests/unit/dataProtectorCore/processProtectedData…
SeddikBellamine Apr 15, 2025
f86f463
Feature/update processprotecteddata (#426)
SeddikBellamine Apr 15, 2025
7e8d112
Add rimraf as a dependency (#427)
Le-Caignec Apr 17, 2025
f15d526
feature/reduce-dept (#428)
Le-Caignec Apr 17, 2025
53067c1
ci: add workflows for conventional commits (#406)
TartanLeGrand Apr 22, 2025
bbb739c
Feature/prepare deployment for avalanche and arbitrum (#429)
Le-Caignec Apr 23, 2025
693fb24
chore: update dependencies and add ESLint configuration (#430)
Le-Caignec Apr 23, 2025
68e05f5
feat: integrate-zod-validation (#431)
Le-Caignec Apr 23, 2025
b3d33ee
ci: migrate smart contract deployment to GitHub Actions (#412)
TartanLeGrand Apr 24, 2025
230e035
fix: Fix Sharing contract constructor arguments order (#433)
zguesmi Apr 29, 2025
57b8998
feat: Deploy DPC on other chains (#432)
Le-Caignec Apr 29, 2025
8dc7111
ci(subgraph): add GitHub Actions workflow for deploying subgraph (#415)
TartanLeGrand May 5, 2025
518f867
Feature make it compatible with theGraph network (#437)
gfournierPro May 13, 2025
5ab3947
fix(package.json): Add dotenv support to build and deployment scripts…
gfournierPro May 13, 2025
6582e96
feat(sharing)!: Remove result proxy address from sharing contract con…
zguesmi May 13, 2025
e7c3e71
feat(sharing): Deploy contracts using Hardhat Ignition (#440)
zguesmi May 14, 2025
5e32a6a
feat(sharing): Import Ignition deployment in OZ upgrades plugin (#441)
zguesmi May 15, 2025
50c6c98
feat(sharing): Refactor sharing contract CI to use reusable workflows…
zguesmi May 15, 2025
ceb7645
feat(sharing): Deploy DPS contract using Github action (#443)
zguesmi May 16, 2025
b6ead68
feat(sharing): Deploy on testnet and save artifacts (#444)
zguesmi May 16, 2025
73b90e6
feat(sharing): Deploy using testnets deployer (#445)
zguesmi May 19, 2025
8de8d10
feat(subgraph): Deploy subgraph on Thegraph network (#446)
zguesmi May 19, 2025
ceaddaa
Fix: scripts subgraph package (#447)
Le-Caignec May 26, 2025
d104c61
feat(sdk): support dynamic config for multiple chains
SeddikBellamine May 28, 2025
dbe426d
ci(sdk): publish npm sdk (#419)
TartanLeGrand Jun 11, 2025
af78bf8
ci(deserializer): add GHA for NPM publishing (#420)
TartanLeGrand Jun 11, 2025
175231a
feat(sdk): add arweave uploadMode option (#448)
PierreJeanjacquot Jun 12, 2025
3f69bcd
ci(sdk): fix npm (#452)
SeddikBellamine Jun 16, 2025
ebdb382
ci(deserializer): fix npm (#451)
TartanLeGrand Jun 16, 2025
571bc80
ci(deserializer): fix working directory
SeddikBellamine Jun 16, 2025
8cd4ad2
Merge remote-tracking branch 'origin/main' into develop
PierreJeanjacquot Jun 16, 2025
00a9d82
chore(sdk): bump sdk v2.0.0-beta.16
PierreJeanjacquot Jun 16, 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
3 changes: 1 addition & 2 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,4 @@
!/packages/subgraph/
/packages/subgraph/generated/
/packages/subgraph/build/
/packages/subgraph/subgraph.yaml
/packages/subgraph/.drone.yml
/packages/subgraph/.drone.yml
229 changes: 1 addition & 228 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,135 +46,7 @@ steps:
fi

---
# deploy DataProtector smart contract to prod, dev or staging
kind: pipeline
type: docker
name: smart-contract deploy

trigger:
event:
- promote
target:
# deploy and verify the DataProtector contract with the dev deployer
- smart-contract-deploy-dev
# deploy and verify the DataProtector contract with the dev deployer and commit the staging environment update
- smart-contract-deploy-staging
# deploy and verify the DataProtector contract with the prod deployer and commit the prod environment update
- smart-contract-deploy-prod
branch:
- develop
- main

steps:
- name: install deps
image: node:18.19
pull: always
commands:
- cd packages/smart-contract
- node -v
- npm -v
- npm ci

- name: check format
image: node:18.19
commands:
- cd packages/smart-contract
- npm run check-format

- name: check lint
image: node:18.19
commands:
- cd packages/smart-contract
- npm run lint

- name: compile smart contracts
image: node:18.19
commands:
- cd packages/smart-contract
- npm run compile

- name: test smart contracts
image: node:18.19
commands:
- cd packages/smart-contract
- npm run test

- name: smart-contract dev/staging deployment
image: node:18.19
environment:
WALLET_PRIVATE_KEY:
from_secret: deployer-dev-privatekey
commands:
- cd packages/smart-contract
- npm run deploy -- --network bellecour
when:
target:
- smart-contract-deploy-staging
- smart-contract-deploy-dev
branch:
- develop

- name: smart-contract prod deployment
image: node:18.19
environment:
WALLET_PRIVATE_KEY:
from_secret: deployer-prod-privatekey
commands:
- cd packages/smart-contract
- npm run deploy -- --network bellecour
when:
target:
- smart-contract-deploy-prod
branch:
- main

- name: update prod env
image: node:18.19
environment:
ENV: prod
commands:
- cd environments
- KEY=dataprotectorContractAddress VALUE=$(cat ../packages/smart-contract/deployments/DataProtector/address) npm run update-env
- KEY=dataprotectorStartBlock VALUE=$(cat ../packages/smart-contract/deployments/DataProtector/block) npm run update-env
- git add environments.json
- git commit -m "$DRONE_DEPLOY_TO deployment $DRONE_BUILD_NUMBER $DRONE_COMMIT" --author="drone-product <[email protected]>"
when:
target:
- smart-contract-deploy-prod

- name: update staging env
image: node:18.19
environment:
ENV: staging
commands:
- cd environments
- KEY=dataprotectorContractAddress VALUE=$(cat ../packages/smart-contract/deployments/DataProtector/address) npm run update-env
- KEY=dataprotectorStartBlock VALUE=$(cat ../packages/smart-contract/deployments/DataProtector/block) npm run update-env
- git add environments.json
- git commit -m "$DRONE_DEPLOY_TO deployment $DRONE_BUILD_NUMBER $DRONE_COMMIT" --author="drone-product <[email protected]>"
when:
target:
- smart-contract-deploy-staging

- name: git-push
image: appleboy/drone-git-push
settings:
remote: ssh://[email protected]/iExecBlockchainComputing/dataprotector-sdk.git
branch: update-env-${DRONE_BUILD_NUMBER}
ssh_key:
from_secret: ssh-key-team-product-github-push
when:
target:
- smart-contract-deploy-prod
- smart-contract-deploy-staging

- name: verify contract
image: node:18.19
commands:
- cd packages/smart-contract
- npm run verify -- --network bellecour $(cat deployments/DataProtector/address) $(cat deployments/DataProtector/args)

---
# deploy sharing smart contract to prod, staging or dev
kind: pipeline
type: docker
Expand Down Expand Up @@ -659,105 +531,6 @@ steps:
password:
from_secret: dockerhub-password

---
kind: pipeline
type: docker
name: subgraph deploy

trigger:
event:
- promote
target:
# deploy the dataprotector subgraph for the staging environment
- subgraph-deploy-staging
# deploy the dataprotector subgraph
- subgraph-deploy-tmp
# deploy the dataprotector subgraph for the prod environment
- subgraph-deploy-prod
branch:
- develop
- main

steps:
- name: install deps
image: node:18.19
pull: always
commands:
- cd packages/subgraph
- npm ci

- name: deploy-v2-staging
image: node:18.19
params:
- START_BLOCK
environment:
GRAPHNODE_URL:
from_secret: graphnode-url-staging
IPFS_URL:
from_secret: ipfs-url-staging
ENV: staging
commands:
- cd packages/subgraph
- export SUBGRAPH_NAME=bellecour/staging-dataprotector-v2
- echo "deploying commit $DRONE_COMMIT on subgraph $SUBGRAPH_NAME"
- npm run codegen
- npm run build
- npx graph create --node $GRAPHNODE_URL $SUBGRAPH_NAME
- npx graph deploy --node $GRAPHNODE_URL $SUBGRAPH_NAME --ipfs $IPFS_URL --version-label $(npm pkg get version)
when:
target:
- subgraph-deploy-staging
branch:
- develop

- name: deploy-v2-tmp
image: node:18.19
params:
- START_BLOCK
environment:
GRAPHNODE_URL:
from_secret: graphnode-url
IPFS_URL:
from_secret: ipfs-url
ENV: prod
commands:
- cd packages/subgraph
- export SUBGRAPH_NAME=bellecour/tmp-dataprotector-v2
- echo "deploying commit $DRONE_COMMIT on subgraph $SUBGRAPH_NAME"
- npm run codegen
- npm run build
- npx graph create --node $GRAPHNODE_URL $SUBGRAPH_NAME
- npx graph deploy --node $GRAPHNODE_URL $SUBGRAPH_NAME --ipfs $IPFS_URL --version-label $DRONE_COMMIT
when:
target:
- subgraph-deploy-tmp
branch:
- main

- name: deploy-v2-prod
image: node:18.19
params:
- START_BLOCK
environment:
GRAPHNODE_URL:
from_secret: graphnode-url
IPFS_URL:
from_secret: ipfs-url
ENV: prod
commands:
- cd packages/subgraph
- export SUBGRAPH_NAME=bellecour/dataprotector-v2
- echo "deploying commit $DRONE_COMMIT on subgraph $SUBGRAPH_NAME"
- npm run codegen
- npm run build
- npx graph create --node $GRAPHNODE_URL $SUBGRAPH_NAME
- npx graph deploy --node $GRAPHNODE_URL $SUBGRAPH_NAME --ipfs $IPFS_URL --version-label $(npm pkg get version)
when:
target:
- subgraph-deploy-prod
branch:
- main

---
#pipeline to deploy app whitelist on iexec
kind: pipeline
Expand Down Expand Up @@ -1510,4 +1283,4 @@ steps:
branch:
- main
target:
- dataprotector-deserializer-publish-latest
- dataprotector-deserializer-publish-latest
12 changes: 12 additions & 0 deletions .github/workflows/conventional-commits.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
name: Conventional Commits

on: [pull_request]

jobs:
build:
name: Conventional Commits
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- uses: webiny/[email protected]
22 changes: 22 additions & 0 deletions .github/workflows/dapp-publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: Publish Docker Image

on:
push:
tags:
- 'protected-data-delivery-dapp-v*'

jobs:
build-test:
uses: iExecBlockchainComputing/github-actions-workflows/.github/workflows/docker-build.yml@fix/docker/types
with:
image-name: 'docker-regis.iex.ec/product/protected-data-delivery-dapp'
image-tag: ${{ github.ref }} # Use the tag of the commit
push: true
dockerfile: 'packages/protected-data-delivery-dapp/Dockerfile'
security-scan: false
hadolint: false
registry: 'docker-regis.iex.ec'
context: 'packages/protected-data-delivery-dapp'
secrets:
username: ${{ secrets.REGIS_USERNAME }}
password: ${{ secrets.REGIS_PASSWORD }}
18 changes: 18 additions & 0 deletions .github/workflows/dapp-test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: Test Docker Image

on:
pull_request:
branches:
- '*' # Trigger on any pull request
paths:
- 'packages/protected-data-delivery-dapp/**' # Trigger only when changes are made to the dapp

jobs:
build-test:
uses: iExecBlockchainComputing/github-actions-workflows/.github/workflows/docker-build.yml@fix/docker/types
with:
image-name: 'protected-data-delivery-dapp'
image-tag: ${{ github.sha }}
push: false
dockerfile: 'packages/protected-data-delivery-dapp/Dockerfile'
context: 'packages/protected-data-delivery-dapp'
Loading
Loading