Skip to content

Commit

Permalink
Merge pull request #430 from trilitech/staging
Browse files Browse the repository at this point in the history
Update main from staging, August 12
  • Loading branch information
timothymcmackin authored Aug 12, 2024
2 parents a4f7175 + ad493b1 commit 888a87d
Show file tree
Hide file tree
Showing 9 changed files with 927 additions and 927 deletions.
8 changes: 7 additions & 1 deletion docs/tutorials/smart-rollup/deploy.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: "Part 4: Deploying (originating) the rollup"
last_update:
date: 25 October 2023
date: 1 August 2024
---

Smart Rollups are originated in a way similar to smart contracts.
Expand Down Expand Up @@ -32,6 +32,12 @@ This command creates an address for the rollup and stores a small amount of data

Now the second terminal window is running inside the container just like the first one.

1. In the new terminal window, go to the folder with the Smart Rollup code:

```bash
cd hello-world-kernel
```

1. In the second terminal window, run this command to verify that the sandbox is running with the correct protocol:

```bash
Expand Down
5 changes: 3 additions & 2 deletions docs/tutorials/smart-rollup/optimize.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: "Part 3: Optimizing the kernel"
last_update:
date: 25 October 2023
date: 7 August 2024
---

To originate the kernel on Tezos, it must fit within the maximum size for a layer 1 operation (32KB).
Expand Down Expand Up @@ -92,7 +92,8 @@ In these steps, you reduce the size of the kernel:

Then you can use the `step inbox` command to simulate receiving the inbox from layer 1.
You can see the hello world kernel messages in the log, which shows that the upgrade from the installer kernel to the full kernel was successful.
Press Ctrl + C to end the debugging session.

1. Press Ctrl + C to end the debugging session.

1. Create a hexadecimal version of the installer kernel by running this command outside of the Docker container:

Expand Down
4 changes: 2 additions & 2 deletions docs/tutorials/smart-rollup/run.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: "Part 5: Running and interacting with the rollup node"
last_update:
date: 25 October 2023
date: 1 August 2024
---

Now that the Smart Rollup is originated on layer 1, anyone can run a Smart Rollup node for it.
Expand All @@ -21,7 +21,7 @@ In these steps, you start a Smart Rollup node, but note that anyone can run a no
1. In the second terminal window, in the Docker container, start the rollup node:

```bash
octez-smart-rollup-node-alpha run operator for "test_smart_rollup" \
octez-smart-rollup-node run operator for "test_smart_rollup" \
with operators "bootstrap2" --data-dir ~/.tezos-rollup-node/ \
--log-kernel-debug --log-kernel-debug-file hello_kernel.debug
```
Expand Down
4 changes: 2 additions & 2 deletions docs/tutorials/smart-rollup/set-up.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: "Part 1: Setting up the application"
last_update:
date: 25 October 2023
date: 12 August 2024
---

To set up the application for the tutorial, you must configure Rust to build the kernel and start a Docker container that has resources that are needed to debug and deploy it.
Expand Down Expand Up @@ -77,7 +77,7 @@ Later, you will use this image to run a sandbox Tezos environment for testing th
```bash
octez-node --version
octez-smart-rollup-wasm-debugger --version
octez-smart-rollup-node-alpha --version
octez-smart-rollup-node --version
octez-client --version
```

Expand Down
1,803 changes: 891 additions & 912 deletions package-lock.json

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
"test": "mocha"
},
"dependencies": {
"@docusaurus/core": "3.2.1",
"@docusaurus/preset-classic": "3.2.1",
"@docusaurus/theme-mermaid": "3.2.1",
"@docusaurus/core": "3.5.1",
"@docusaurus/preset-classic": "3.5.1",
"@docusaurus/theme-mermaid": "3.5.1",
"@emotion/react": "11.11.1",
"@emotion/styled": "11.11.0",
"@mdx-js/react": "3.0.0",
Expand All @@ -33,7 +33,7 @@
"slick-carousel": "1.8.1"
},
"devDependencies": {
"@docusaurus/module-type-aliases": "3.2.1",
"@docusaurus/module-type-aliases": "3.5.1",
"chai": "5.0.0",
"glob": "10.3.10",
"jsdom": "24.1.0",
Expand Down
5 changes: 3 additions & 2 deletions src/components/TutorialCard/index.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
import React from 'react';
import clsx from 'clsx';
import styles from './styles.module.css';
import Link from '@docusaurus/Link';

export default function TutorialCard({ title, href, description, link, emoji }) {
return (
<div className={clsx(styles.tutorialcard)}>
<div>
<Link href={href} target="_self" className={clsx(styles.tutorialcardlinkcontainer)}>
<p className={clsx(styles.emoji)}>{emoji}</p>
<h3 className={clsx(styles.title)}>{title}</h3>
<p className={clsx(styles.description)}>{description}</p>
<a href={href} className={clsx(styles.link)}>
<p style={{ margin: 0 }}>{link}</p>
</a>
</div>
</Link>
</div>
);
}
7 changes: 5 additions & 2 deletions src/components/TutorialCard/styles.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,14 @@
.tutorialcard:hover {
border: 1px solid #787D82;
}
.tutorialcardlinkcontainer:hover {
text-decoration: none;
}

@media (max-width: 767px) {
.tutorialcard {
width: calc(100% - 20px);
margin: 10px 0;
width: calc(100% - 20px);
margin: 10px 0;
}
}

Expand Down
10 changes: 10 additions & 0 deletions src/scripts/process_downloaded_glossary.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,16 @@ const process_glossary = async () => {
}
});

// Convert section header links to match the rest of the site
const sectionHeaderLinks = trimmed.querySelectorAll('a.headerlink');
sectionHeaderLinks.forEach((link) => {
link.setAttribute('class', 'hash-link');
const title = link.parentNode.firstChild.textContent;
link.setAttribute('aria-label', 'Direct link to ' + title);
link.setAttribute('title', 'Direct link to ' + title);
link.textContent = '';
});

// Wrap with <div class='imported-glossary'></div> to apply custom styles
const wrapper = new JSDOM('<div id="imported-glossary"></div>');
const imported_glossary = wrapper.window.document.querySelector('div#imported-glossary');
Expand Down

0 comments on commit 888a87d

Please sign in to comment.