Skip to content

Commit d660738

Browse files
committed
Merge main into feature/confidential-computing
2 parents d5ce7a8 + e548ceb commit d660738

File tree

107 files changed

+1371
-688
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+1371
-688
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@ name: main-ci
22

33
on:
44
workflow_dispatch:
5-
push:
6-
paths-ignore:
7-
- 'README.md'
5+
pull_request:
86

97
jobs:
108
build:

.vitepress/config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ export default withMermaid(
101101
// https://vitepress.dev/reference/default-theme-config
102102
nav: [
103103
{ text: 'Get Started', link: '/get-started/welcome' },
104-
{ text: 'Guides', link: '/guides/build-iapp/' },
104+
{ text: 'Guides', link: '/guides/build-iapp/build-&-deploy' },
105105
{ text: 'References', link: '/references/dataProtector' },
106106
{
107107
component: 'ChainSelector',

.vitepress/sidebar.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ export function getSidebar() {
7373
},
7474
{
7575
text: '🪙 RLC Token',
76-
link: '/get-started/rlc',
76+
link: '/get-started/overview/rlc',
7777
},
7878
],
7979
},
@@ -113,6 +113,10 @@ export function getSidebar() {
113113
text: '💸 Pay Per Task Model',
114114
link: '/get-started/protocol/pay-per-task',
115115
},
116+
{
117+
text: 'iExec DOracle',
118+
link: '/get-started/protocol/iexec-doracle',
119+
},
116120
{
117121
text: '⚙️ Workers & Workerpools',
118122
collapsed: true,
@@ -486,10 +490,6 @@ export function getSidebar() {
486490
text: 'Advanced Configuration',
487491
link: '/references/dataProtector/advanced/advanced-configuration',
488492
},
489-
{
490-
text: 'Sharing smart contract',
491-
link: '/references/dataProtector/advanced/dps-smart-contract',
492-
},
493493
{
494494
text: 'Apps whitelist',
495495
link: '/references/dataProtector/advanced/apps-whitelist',

README.md

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ steps to contribute:
7979

8080
Fork this repository and ensure you're working on the `main` branch:
8181

82-
[![fork-button](./src/public/fork-button.png)](https://github.com/iExecBlockchainComputing/documentation/fork)
82+
[![fork-button](/src/public/fork-button.png)](https://github.com/iExecBlockchainComputing/documentation/fork)
8383

8484
### 2. Set Up Your Development Environment
8585

@@ -168,18 +168,19 @@ for input parameters:
168168
## TODO
169169

170170
- Add an audit section for smart contracts
171-
- Add Arbitrum support
172-
- On arbitrum hide : DataProtector Sharing ??
173171
- Adapt hardcoded address to feat with new contracts deployed on arbitrum
174172
- Add link to the new explorer feature Asset_Types in the guide =>
175173
`handle-schemas-dataset-types`
176174
- Add link to remix for deploying whitelist
175+
<<<<<<< HEAD
177176
- complete `use-iapp` section
178177
- Maybe split input and output in two diff sub section in build your iapp guide
178+
=======
179+
- SGX vs TDX need review
180+
>>>>>>> origin/main
179181
- Explorer l'intégration de codeSpace
180-
- complete `Protocol`section
181-
- Add a Development workflow
182-
- Update context7 when doc will be deployed
182+
- Add a Development workflow section (1 - ProtectData, 2- ...)
183+
- Update context7 when doc will be deployed (Martin)
183184
- Check theGraph Images with design Team
184185
- Update the Dune Dashboard to the final version
185186
- Add new section in `iexec-explorer.md` file to talk about: available chain on
@@ -188,9 +189,17 @@ for input parameters:
188189
- Check how to pay guide to update with the launch on Arbitrum (RLC vs xRLC)
189190
- framework AI supporté TDX vs SGX
190191
- check glossary
191-
- migrate github SDK doc here
192+
- migrate github iexec SDK doc here
192193
- migrate pay-per-task page into a guide
193194
- check pages (introduction & getting-started) for use-iapp guide
195+
- explain TDX vs SGX
196+
- Give recap of Workerpool address fo chains
197+
- Talk about ENS on Bellecour(it's not supported on arbitrum)
194198
- Rework Advanced iApp building guides. (from "old" protocol doc)
199+
<<<<<<< HEAD
195200
- Talk about encrypting results in use-iapp
196201
- Refactor "advanced" section in build-iapp
202+
=======
203+
- Rework src\get-started\protocol\iexec-doracle.md (transfer to guide or
204+
rewrite)
205+
>>>>>>> origin/main

src/build-iapp/guides/build-&-deploy.md

Whitespace-only changes.

src/components/AddressChip.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
<script setup>
1616
import { ref, computed } from 'vue';
1717
import avatarStyles from './profile.module.css';
18-
import { getAvatarVisualNumber } from '../utils/getAvatarVisualNumber';
19-
import { truncateAddress } from '../utils/truncateAddress';
18+
import { getAvatarVisualNumber } from '@/utils/getAvatarVisualNumber';
19+
import { truncateAddress } from '@/utils/truncateAddress';
2020
2121
const props = defineProps({
2222
address: {
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<script setup>
2+
import { computed } from 'vue';
3+
import { VPBadge } from 'vitepress/theme';
4+
import useUserStore from '@/stores/useUser.store';
5+
6+
const userStore = useUserStore();
7+
8+
// Check if Arbitrum is selected (Arbitrum chain ID is 42161)
9+
const isArbitrumSelected = computed(() => {
10+
return userStore.chainId === 42161;
11+
});
12+
13+
// Only show the badge when Arbitrum is selected
14+
const shouldShow = computed(() => isArbitrumSelected.value);
15+
</script>
16+
17+
<template>
18+
<VPBadge
19+
v-if="shouldShow"
20+
type="tip"
21+
text="Chain Not Supported"
22+
style="
23+
color: var(--vp-c-red-1);
24+
background-color: hsla(350, 89%, 60%, 8%);
25+
margin-top: 1px;
26+
margin-right: 4px;
27+
"
28+
/>
29+
</template>

src/components/ChainSelector.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ if (!userStore.chainId) {
7777
userStore.setSelectedChain(walletChain);
7878
}
7979
} else {
80-
// Otherwise, use Bellecour as default
81-
const defaultChain = getChainById(0x86); // Bellecour
80+
// Otherwise, use Arbitrum as default
81+
const defaultChain = getChainById(42161); // Arbitrum
8282
if (defaultChain) {
8383
userStore.setSelectedChain(defaultChain);
8484
}

src/components/TokenSymbol.vue

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<template>
2+
<span class="font-semibold text-inherit">{{ tokenSymbol }}</span>
3+
</template>
4+
5+
<script setup lang="ts">
6+
import { computed } from 'vue';
7+
import useUserStore from '@/stores/useUser.store';
8+
9+
const userStore = useUserStore();
10+
11+
// Computed property to get the correct token symbol based on selected chain
12+
const tokenSymbol = computed(() => {
13+
const currentChainId = userStore.getCurrentChainId();
14+
15+
// Bellecour (0x86) uses xRLC, Arbitrum (42161) uses RLC
16+
if (currentChainId === 0x86) {
17+
return 'xRLC';
18+
} else if (currentChainId === 42161) {
19+
return 'RLC';
20+
}
21+
22+
// Default fallback
23+
return 'RLC';
24+
});
25+
</script>

src/get-started/develop-with-ai.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ description:
77

88
# 🤖 Develop with AI
99

10-
Building privacy-first applications with iExec can be accelerated using
10+
AI tools accelerate building privacy-first applications with iExec using
1111
AI-powered development tools. This guide covers how to effectively use AI
1212
assistants while maintaining security best practices.
1313

1414
## 📚 Documentation for LLMs and AI Code Editors
1515

16-
You can use some MCP (Model Control Protocol) servers like
16+
You can use MCP (Model Control Protocol) servers like
1717
[Context7](https://context7.com/iexecblockchaincomputing/documentation-tools) to
1818
provide:
1919

@@ -23,12 +23,12 @@ provide:
2323

2424
## 🎨 Vibe Coding Integration
2525

26-
Vibe coding is a modern way to build applications by describing what you want in
27-
plain language. An AI assistant (like Cursor or ChatGPT) then generates code
28-
based on your description.
26+
Vibe coding lets you build applications by describing what you want in plain
27+
language. An AI assistant (like Cursor or ChatGPT) then generates code based on
28+
your description.
2929

30-
It's fast, creative, and helps you prototype ideas quickly. Even if you're not a
31-
technical expert you can:
30+
It's fast, creative, and helps you prototype ideas quickly. Even non-technical
31+
users can:
3232

3333
- Write a prompt like: "I want to create a form able to protect my data with
3434
DataProtector"

0 commit comments

Comments
 (0)