Skip to content

Commit 0beee8d

Browse files
committed
Merge main into feat-ai-frameworks: resolve conflicts and move AI file to protocol section
2 parents 4024560 + 674f670 commit 0beee8d

File tree

65 files changed

+1512
-2134
lines changed

Some content is hidden

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

65 files changed

+1512
-2134
lines changed

.vitepress/config.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ export default withMermaid(
103103
{ text: 'Get Started', link: '/get-started/welcome' },
104104
{ text: 'Guides', link: '/guides/build-iapp/build-&-test' },
105105
{ text: 'References', link: '/references/dataProtector' },
106+
{ text: 'Protocol', link: '/protocol/proof-of-contribution' },
106107
{
107108
component: 'ChainSelector',
108109
props: {

.vitepress/sidebar.ts

Lines changed: 78 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export function getSidebar() {
88
items: [
99
{ text: '💡 Welcome', link: '/get-started/welcome' },
1010
{
11-
text: '🛠️ Toolkit',
11+
text: 'Toolkit',
1212
link: '/get-started/toolkit',
1313
},
1414
{
@@ -39,21 +39,18 @@ export function getSidebar() {
3939
],
4040
},
4141
{
42-
text: '🚀 Quick Start',
42+
text: 'Quick Start',
4343
link: '/get-started/quick-start',
4444
},
4545
{
46-
text: '📋 Use Cases',
46+
text: 'Use Cases',
4747
link: '/get-started/use-cases',
4848
},
4949
{
50-
text: '🤖 Develop with AI',
50+
text: 'Develop with AI',
5151
link: '/get-started/develop-with-ai',
5252
},
53-
{
54-
text: '🧠 iExec for AI',
55-
link: '/get-started/ai',
56-
},
53+
5754
],
5855
},
5956
{
@@ -76,7 +73,7 @@ export function getSidebar() {
7673
link: '/get-started/overview/workerpool',
7774
},
7875
{
79-
text: '🪙 RLC Token',
76+
text: 'RLC Token',
8077
link: '/get-started/overview/rlc',
8178
},
8279
],
@@ -106,60 +103,8 @@ export function getSidebar() {
106103
},
107104
],
108105
},
109-
{
110-
text: 'PROTOCOL',
111-
items: [
112-
{
113-
text: '🛡️ Proof of Contribution',
114-
link: '/get-started/protocol/proof-of-contribution',
115-
},
116-
{
117-
text: 'Pay Per Task Model',
118-
link: '/get-started/protocol/pay-per-task',
119-
},
120-
{
121-
text: 'Oracle',
122-
link: '/get-started/protocol/oracle',
123-
},
124-
{
125-
text: 'Workers & Workerpools',
126-
collapsed: true,
127-
items: [
128-
{
129-
text: 'Worker Quick Start',
130-
link: '/get-started/protocol/worker/quick-start',
131-
},
132-
{
133-
text: 'Manage Workerpool Access',
134-
link: '/get-started/protocol/worker/manage-access',
135-
},
136-
],
137-
},
138-
{
139-
text: '🔒 TEE Technology',
140-
collapsed: true,
141-
items: [
142-
{
143-
text: 'Introduction to TEE Technologies',
144-
link: '/get-started/protocol/tee/introduction',
145-
},
146-
{
147-
text: 'Intel SGX Technology',
148-
link: '/get-started/protocol/tee/intel-sgx',
149-
},
150-
{
151-
text: 'Intel TDX Technology',
152-
link: '/get-started/protocol/tee/intel-tdx',
153-
},
154-
{
155-
text: 'SGX vs TDX Comparison',
156-
link: '/get-started/protocol/tee/sgx-vs-tdx',
157-
},
158-
],
159-
},
160106

161-
],
162-
},
107+
163108
],
164109
'/guides/': [
165110
{
@@ -208,36 +153,24 @@ export function getSidebar() {
208153
collapsed: true,
209154
items: [
210155
{
211-
text: 'Overview',
212-
link: '/guides/build-iapp/advanced/overview',
213-
},
214-
{
215-
text: 'Quick Start for Developers',
216-
link: '/guides/build-iapp/advanced/quick-start-for-developers',
156+
text: 'Quick Start',
157+
link: '/guides/build-iapp/advanced/quick-start',
217158
},
218159
{
219-
text: 'Build your first application',
220-
link: '/guides/build-iapp/advanced/your-first-app',
221-
},
222-
{
223-
text: 'Build your first SGX app (SCONE)',
224-
link: '/guides/build-iapp/advanced/create-your-first-sgx-app',
160+
text: 'Build your first SGX app',
161+
link: '/guides/build-iapp/advanced/build-your-first-sgx-iapp',
225162
},
226163
{
227164
text: 'End-to-end Encryption',
228-
link: '/guides/build-iapp/advanced/end-to-end-encryption',
229-
},
230-
{
231-
text: 'SGX Encrypted Dataset',
232-
link: '/guides/build-iapp/advanced/sgx-encrypted-dataset',
165+
link: '/guides/build-iapp/advanced/protect-the-result',
233166
},
234167
{
235168
text: 'Access Confidential Assets',
236169
link: '/guides/build-iapp/advanced/access-confidential-assets',
237170
},
238171
{
239172
text: 'Build Intel TDX app',
240-
link: '/guides/build-iapp/advanced/create-your-first-tdx-app',
173+
link: '/guides/build-iapp/advanced/build-your-first-tdx-iapp',
241174
},
242175
],
243176
},
@@ -247,11 +180,11 @@ export function getSidebar() {
247180
text: 'USE AN iAPP',
248181
items: [
249182
{
250-
text: '📝 Introduction',
183+
text: 'Introduction',
251184
link: '/guides/use-iapp/introduction',
252185
},
253186
{
254-
text: '🚀 Getting Started',
187+
text: 'Getting Started',
255188
link: '/guides/use-iapp/getting-started',
256189
},
257190
{
@@ -266,6 +199,10 @@ export function getSidebar() {
266199
text: 'Run iApp without ProtectedData',
267200
link: '/guides/use-iapp/run-iapp-without-ProtectedData',
268201
},
202+
{
203+
text: 'Integrate Web3 Messaging',
204+
link: '/guides/use-iapp/integrate-web3-messaging',
205+
},
269206
],
270207
},
271208
],
@@ -579,24 +516,78 @@ export function getSidebar() {
579516
},
580517
],
581518
},
582-
{
583-
text: 'Integration Guide',
584-
link: '/references/web3telegram/integration-guide',
585-
},
519+
586520
{
587521
text: 'Advanced Configuration',
588522
link: '/references/web3telegram/advanced-configuration',
589523
},
590524
],
591525
},
592526
{
593-
text: '🔧 iExec SDK',
527+
text: 'iExec SDK',
594528
link: '/references/sdk',
595529
},
596530
{
597531
text: '📖 Glossary',
598532
link: '/references/glossary',
599533
},
600534
],
535+
'/protocol/': [
536+
{
537+
text: 'PROTOCOL',
538+
items: [
539+
{
540+
text: '🛡️ Proof of Contribution',
541+
link: '/protocol/proof-of-contribution',
542+
},
543+
{
544+
text: 'Pay Per Task Model',
545+
link: '/protocol/pay-per-task',
546+
},
547+
{
548+
text: 'Oracle',
549+
link: '/protocol/oracle',
550+
},
551+
{
552+
text: 'Workers & Workerpools',
553+
items: [
554+
{
555+
text: 'Worker Quick Start',
556+
link: '/protocol/worker/quick-start',
557+
},
558+
{
559+
text: 'Manage Workerpool Access',
560+
link: '/protocol/worker/manage-access',
561+
},
562+
],
563+
},
564+
{
565+
text: '🔒 TEE Technology',
566+
items: [
567+
{
568+
text: 'Introduction to TEE Technologies',
569+
link: '/protocol/tee/introduction',
570+
},
571+
{
572+
text: 'Intel SGX Technology',
573+
link: '/protocol/tee/intel-sgx',
574+
},
575+
{
576+
text: 'Intel TDX Technology',
577+
link: '/protocol/tee/intel-tdx',
578+
},
579+
{
580+
text: 'SGX vs TDX Comparison',
581+
link: '/protocol/tee/sgx-vs-tdx',
582+
},
583+
],
584+
},
585+
{
586+
text: '🧠 iExec for AI',
587+
link: '/protocol/ai',
588+
},
589+
],
590+
},
591+
],
601592
} as DefaultTheme.Sidebar;
602593
}

README.md

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -226,11 +226,9 @@ for input parameters:
226226

227227
## TODO
228228

229-
- Adapt hardcoded address to feat with new contracts deployed on arbitrum
230229
- Add link to the new explorer feature Asset_Types in the guide =>
231230
`handle-schemas-dataset-types`
232231
- Add link to remix for deploying whitelist
233-
- complete `use-iapp` section
234232
- Maybe split input and output in two diff sub section in build your iapp guide
235233
- Explorer l'intégration de codeSpace
236234
- Add a Development workflow section (1 - ProtectData, 2- ...)
@@ -239,25 +237,20 @@ for input parameters:
239237
- Update the Dune Dashboard to the final version
240238
- Add new section in `iexec-explorer.md` file to talk about: available chain on
241239
the UI + SRLC/RLC on account section feature of the protocol
242-
- Update or add design illustrations based on the new design system
243-
- Check how to pay guide to update with the launch on Arbitrum (RLC vs xRLC)
244240
- framework AI supporté
245241
- check glossary
246-
- migrate github iexec SDK doc here
247242
- migrate pay-per-task page into a guide
248243
- check pages (introduction & getting-started) for use-iapp guide
249244
- Schema what is iexec to do and implement
250245
- Give recap of Workerpool address fo chains
251246
- Talk about ENS on Bellecour(it's not supported on arbitrum)
252-
- Rework Advanced iApp building guides. (from "old" protocol doc) <<<<<<< HEAD
253247
- Talk about encrypting results in use-iapp
254248
- Refactor "advanced" section in build-iapp
255249
- Rework src\get-started\protocol\iexec-doracle.md (transfer to guide or
256250
rewrite)
257251
- Talk about encrypting results in use-iapp
258-
- Refactor "advanced" section in build-iapp
259252
- Rework src\get-started\protocol\oracle.md (transfer to guide or rewrite)
260253
- Talk about iApp secret
261254
- Improve Guide in build-iapp section - be more clear for builder ( how to
262255
process process protectedData, clarify input-output guide)
263-
- refactor iapp generator cli reference
256+
- Add illustration in the different pages
-110 KB
Binary file not shown.

src/assets/rlc/dune-dashboard.png

-427 KB
Binary file not shown.

src/assets/use-cases/elizaos.png

415 KB
Loading
2.56 MB
Loading
1.48 MB
Loading
1.66 MB
Loading

src/components/TokenSymbol.vue

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)