diff --git a/components/Editor/examples.ts b/components/Editor/examples.ts
index 301fb13..5215966 100644
--- a/components/Editor/examples.ts
+++ b/components/Editor/examples.ts
@@ -4,6 +4,7 @@ export const Examples: ExampleCode = {
Cairo: [
`use core::felt252;
+#[executable]
fn main() -> felt252 {
let n = 2 + 3;
n
@@ -12,6 +13,7 @@ fn main() -> felt252 {
const my_constant: felt252 = 42;
+#[executable]
fn main() {
// non-mutable variable
@@ -34,25 +36,27 @@ fn main() {
// my_mut_var = 'hello world' <-- fails to compile
}`,
- `use core::felt252;
-
-fn main() {
- let my_felt252 = 10;
-
- // Since a felt252 might not fit in a u8, we need to unwrap the Option
type
- let my_u8: u8 = my_felt252.try_into().unwrap();
-
- let my_u16: u16 = my_u8.into();
- let my_u32: u32 = my_u16.into();
- let my_u64: u64 = my_u32.into();
- let _my_u128: u128 = my_u64.into();
-
- // As a felt252 is smaller than a u256, we can use the into() method
- let _my_u256: u256 = my_felt252.into();
- let _my_usize: usize = my_felt252.try_into().unwrap();
- let _my_other_felt252: felt252 = my_u8.into();
- let _my_third_felt252: felt252 = my_u16.into();
-}`,
+ // ,
+ // `use core::felt252;
+
+ // #[executable]
+ // fn main() {
+ // let my_felt252 = 10;
+
+ // // Since a felt252 might not fit in a u8, we need to unwrap the Option type
+ // let my_u8: u8 = my_felt252.try_into().unwrap();
+
+ // let my_u16: u16 = my_u8.into();
+ // let my_u32: u32 = my_u16.into();
+ // let my_u64: u64 = my_u32.into();
+ // let _my_u128: u128 = my_u64.into();
+
+ // // As a felt252 is smaller than a u256, we can use the into() method
+ // let _my_u256: u256 = my_felt252.into();
+ // let _my_usize: usize = my_felt252.try_into().unwrap();
+ // let _my_other_felt252: felt252 = my_u8.into();
+ // let _my_third_felt252: felt252 = my_u16.into();
+ // }`
`#[derive(Drop)]
enum Direction {
Up,
@@ -61,6 +65,7 @@ enum Direction {
Right
}
+#[executable]
fn main() {
// if / else expression
@@ -126,6 +131,7 @@ fn add(a: u32, b: u32) -> u64 {
}
// This functions doesn't return anything.
+#[executable]
fn main() {
let a = 1;
let b = 2;
@@ -137,28 +143,30 @@ fn main() {
let _z = add(a: x, b: y);
}
`,
- `use array::ArrayTrait;
+ // `use array::ArrayTrait;
-fn main () {
- let mut a = ArrayTrait::new();
+ // #[executable]
+ // fn main () {
+ // let mut a = ArrayTrait::new();
- // add some items in the array
- a.append(1);
- a.append(2);
-
- // get array length
- assert!(a.len() == 2, "wrong array length");
+ // // add some items in the array
+ // a.append(1);
+ // a.append(2);
- // 2 ways to read an item from the array
- // * get() returns an Option so you can handle out-of-bounds error
- // * at() panics in case of out-of-bounds error
- let first_element = *a.get(0).unwrap().unbox();
- // a.get(2) will return None
+ // // get array length
+ // assert!(a.len() == 2, "wrong array length");
- let second_element = *a.at(1);
- // a.at(2) will cause an error
-}`,
- `fn main () {
+ // // 2 ways to read an item from the array
+ // // * get() returns an Option so you can handle out-of-bounds error
+ // // * at() panics in case of out-of-bounds error
+ // let first_element = *a.get(0).unwrap().unbox();
+ // // a.get(2) will return None
+
+ // let second_element = *a.at(1);
+ // // a.at(2) will cause an error
+ // }`
+ `#[executable]
+fn main () {
let mut balances: Felt252Dict = Default::default();
balances.insert('Alex', 100);
@@ -182,6 +190,7 @@ fn foo_receives_ref(ref arr: Array) {
// keeps the ownership of the array.
}
+#[executable]
fn main() {
// as the creator of arr, the main function owns the array
let mut arr = ArrayTrait::::new();
@@ -197,6 +206,7 @@ fn main() {
}`,
`use core::felt252;
+#[executable]
fn main() -> felt252 {
let n = 10;
let result = fib(1, 1, n);
@@ -494,10 +504,10 @@ ret;
export const CairoExampleNames = [
'Simple',
'Variables & mutability',
- 'Type casting',
+ // 'Type casting',
'Control flow',
'Functions',
- 'Arrays',
+ // 'Arrays',
'Dictionaries',
'Ownership',
'Fibonacci',
diff --git a/components/Editor/index.tsx b/components/Editor/index.tsx
index 535ceab..c1498b8 100644
--- a/components/Editor/index.tsx
+++ b/components/Editor/index.tsx
@@ -25,7 +25,12 @@ import { Setting, SettingsContext } from 'context/settingsContext'
import { getAbsoluteURL } from 'util/browser'
import { isArgumentStringValid } from 'util/compiler'
-import { codeHighlight, isEmpty, objToQueryString } from 'util/string'
+import {
+ codeHighlight,
+ formatTime,
+ isEmpty,
+ objToQueryString,
+} from 'util/string'
import { Examples } from 'components/Editor/examples'
import { Tracer } from 'components/Tracer'
@@ -36,11 +41,13 @@ import { cn } from '../../util/styles'
import { ArgumentsHelperModal } from './ArgumentsHelperModal'
import { registerCairoLanguageSupport } from './cairoLangConfig'
import Console from './Console'
+import { DownloadProof } from './DownloadProof'
import EditorControls from './EditorControls'
import EditorFooter from './EditorFooter'
import ExtraColumn from './ExtraColumn'
import Header from './Header'
import { InstructionsTable } from './InstructionsTable'
+
// @ts-ignore - Cairo is not part of the official highlightjs package
type Props = {
readOnly?: boolean
@@ -83,6 +90,10 @@ const Editor = ({ readOnly = false, isCairoLangPage = false }: Props) => {
debugMode,
activeSierraIndexes,
setDebugMode,
+ proof,
+ proofTime,
+ verificationTime,
+ provingIsNotSupported,
} = useContext(CairoVMApiContext)
const { addToConsoleLog, isThreeColumnLayout } = useContext(AppUiContext)
@@ -247,10 +258,34 @@ const Editor = ({ readOnly = false, isCairoLangPage = false }: Props) => {
}
if (executionState === ProgramExecutionState.Error) {
+ if (executionPanicMessage && executionPanicMessage.length > 0) {
+ addToConsoleLog(
+ 'Runtime error: ' + executionPanicMessage,
+ LogType.Error,
+ )
+ } else {
+ addToConsoleLog('Runtime error', LogType.Error)
+ }
+ }
+
+ if (proof && proofTime) {
+ addToConsoleLog('Generating proof...', LogType.Info)
addToConsoleLog(
- 'Runtime error: ' + executionPanicMessage,
- LogType.Error,
+ `Proof generation successful (finished in ${formatTime(proofTime)})`,
+ LogType.Info,
)
+ addToConsoleLog(, LogType.Info)
+ if (verificationTime) {
+ addToConsoleLog('Verifying proof...', LogType.Info)
+ addToConsoleLog(
+ `Verification successful (finished in ${formatTime(
+ verificationTime,
+ )})`,
+ LogType.Info,
+ )
+ }
+ } else if (provingIsNotSupported) {
+ addToConsoleLog('Proving is not supported for contracts', LogType.Error)
}
} else if (compilationState === ProgramCompilationState.CompilationErr) {
addToConsoleLog('Compilation failed', LogType.Error)
@@ -333,10 +368,18 @@ const Editor = ({ readOnly = false, isCairoLangPage = false }: Props) => {
[setProgramArguments],
)
- const handleCompileRun = useCallback(() => {
- compileCairoCode(cairoCode, removeExtraWhitespaces(programArguments))
- setCompiledCairoCode(cairoCode)
- }, [cairoCode, programArguments, compileCairoCode])
+ const handleCompileRun = useCallback(
+ async (variant: 'run' | 'run-prove-verify' | 'prove') => {
+ await compileCairoCode(
+ cairoCode,
+ removeExtraWhitespaces(programArguments),
+ variant === 'run-prove-verify',
+ variant === 'run-prove-verify',
+ )
+ setCompiledCairoCode(cairoCode)
+ },
+ [compileCairoCode, cairoCode, programArguments],
+ )
const handleCopyPermalink = useCallback(() => {
const params = {
diff --git a/components/ui/MultiButton.tsx b/components/ui/MultiButton.tsx
new file mode 100644
index 0000000..d5a1c7f
--- /dev/null
+++ b/components/ui/MultiButton.tsx
@@ -0,0 +1,70 @@
+import { useState } from 'react'
+
+import { Menu, MenuButton, MenuItem, MenuItems } from '@headlessui/react'
+import { ChevronDownIcon } from '@heroicons/react/20/solid'
+
+import { Button } from './Button'
+
+type CompileMods = 'run' | 'run-prove-verify'
+interface MultiButtonProps {
+ onCompileRun: (variant: CompileMods) => void
+}
+
+const MultiButton = ({ onCompileRun }: MultiButtonProps) => {
+ const [selected, setSelected] = useState('run-prove-verify')
+
+ const handleMainButtonClick = () => {
+ switch (selected) {
+ case 'run-prove-verify':
+ onCompileRun('run-prove-verify')
+ break
+ case 'run':
+ onCompileRun('run')
+ break
+ default:
+ break
+ }
+ }
+
+ return (
+
+
+
+
+