From 9b1075a9bc42d29398721411839e0ed7d590ea00 Mon Sep 17 00:00:00 2001 From: Marc Date: Wed, 29 Jan 2025 15:45:40 +0100 Subject: [PATCH 1/4] Change Jenkinsfile to use new IPFS architecture and GraphNode --- Jenkinsfile_Subgraph_bellecour | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile_Subgraph_bellecour b/Jenkinsfile_Subgraph_bellecour index b6ac597..5dbf228 100644 --- a/Jenkinsfile_Subgraph_bellecour +++ b/Jenkinsfile_Subgraph_bellecour @@ -1,8 +1,9 @@ //Readme @ http://gitlab.iex.ec:30000/iexec/jenkins-library -@Library('global-jenkins-library@2.7.7') _ +@Library('global-jenkins-library@2.8.1') _ deploySubGraph( - targetRemoteHost : 'azubgrpbp-thegraph-bellecour.public.az2.internal', + targetRemoteHostGraphNode : 'azubgrpbp-thegraph.public.az2.internal', + targetRemoteHostIPFS : 'ipfs-upload.v8-bellecour.iex.ec', subgraphFolder: './', subgraphFilename: 'subgraph.bellecour.yaml', subgraphVersionLabel: 'v1.0.0-rc.1', From 9b0b1ea6baf1a406ede5fa00c7fbf4ddbe9ce80c Mon Sep 17 00:00:00 2001 From: gfournieriExec Date: Thu, 30 Jan 2025 09:22:29 +0100 Subject: [PATCH 2/4] Add DealSponsored event and update IexecInterfaceNative contract path in subgraph configuration --- subgraph.bellecour.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/subgraph.bellecour.yaml b/subgraph.bellecour.yaml index feb39c3..cf39613 100644 --- a/subgraph.bellecour.yaml +++ b/subgraph.bellecour.yaml @@ -69,9 +69,10 @@ dataSources: - Seize - Lock - Unlock + - DealSponsored abis: - name: IexecInterfaceToken - file: node_modules/@iexec/poco/build/contracts/IexecInterfaceNative.json + file: node_modules/@iexec/poco/artifacts/contracts/IexecInterfaceNative.sol/IexecInterfaceNative.json eventHandlers: - event: CreateCategory(uint256,string,string,uint256) handler: handleCreateCategory @@ -107,6 +108,8 @@ dataSources: handler: handleLock - event: Unlock(address,uint256) handler: handleUnlock + - event: DealSponsored(bytes32,address) + handler: handleDealSponsored callHandlers: - function: matchOrders((address,uint256,uint256,bytes32,address,address,address,bytes32,bytes),(address,uint256,uint256,bytes32,address,address,address,bytes32,bytes),(address,uint256,uint256,bytes32,uint256,uint256,address,address,address,bytes32,bytes),(address,uint256,address,uint256,address,uint256,address,uint256,bytes32,uint256,uint256,address,address,string,bytes32,bytes)) handler: handleMatchOrders From e26755a7a0d7aaf18dc15600f27460c51e4edd19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20James=20Toussaint?= <33313130+jeremyjams@users.noreply.github.com> Date: Mon, 3 Feb 2025 13:57:51 +0100 Subject: [PATCH 3/4] Remove handleDealSponsored from bellecour yml --- subgraph.bellecour.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/subgraph.bellecour.yaml b/subgraph.bellecour.yaml index cf39613..52feb4a 100644 --- a/subgraph.bellecour.yaml +++ b/subgraph.bellecour.yaml @@ -69,7 +69,6 @@ dataSources: - Seize - Lock - Unlock - - DealSponsored abis: - name: IexecInterfaceToken file: node_modules/@iexec/poco/artifacts/contracts/IexecInterfaceNative.sol/IexecInterfaceNative.json @@ -108,8 +107,6 @@ dataSources: handler: handleLock - event: Unlock(address,uint256) handler: handleUnlock - - event: DealSponsored(bytes32,address) - handler: handleDealSponsored callHandlers: - function: matchOrders((address,uint256,uint256,bytes32,address,address,address,bytes32,bytes),(address,uint256,uint256,bytes32,address,address,address,bytes32,bytes),(address,uint256,uint256,bytes32,uint256,uint256,address,address,address,bytes32,bytes),(address,uint256,address,uint256,address,uint256,address,uint256,bytes32,uint256,uint256,address,address,string,bytes32,bytes)) handler: handleMatchOrders From f73ab344994c720d490efed305ea60ebee10c516 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20James=20Toussaint?= <33313130+jeremyjams@users.noreply.github.com> Date: Mon, 3 Feb 2025 14:05:13 +0100 Subject: [PATCH 4/4] Update changelog --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 62151d2..6dc62b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,9 @@ ## vNext - Add `sponsor` to `deal`. (#31) -- Update staging deployment hosts. (#29) +- Update deployment hosts: + - production (#30) + - staging (#29) - Display coverage in Github PR checks. (#26) - Add integration test suite. (#21) - Add unit test suite. (#20)