Skip to content

Revert "Add support for Proof and Verification (#200)" #208

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
barabanovro merged 1 commit into from
Mar 1, 2025
Merged

Revert "Add support for Proof and Verification (#200)" #208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 0 additions & 24 deletions components/Editor/DownloadProof.tsx
View file
Open in desktop

This file was deleted.

21 changes: 5 additions & 16 deletions components/Editor/EditorControls.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import { Priority, useRegisterActions } from 'kbar'
import { OnChangeValue } from 'react-select'

import { Button, Input } from 'components/ui'
import MultiButton from 'components/ui/MultiButton'

import { cn } from '../../util/styles'

Expand All @@ -24,7 +23,7 @@ type EditorControlsProps = {
option: OnChangeValue<SelectOption, false>,
) => void
onCopyPermalink: () => void
onCompileRun: (variant: 'run' | 'run-prove-verify') => void
onCompileRun: () => void
onProgramArgumentsUpdate: (args: string) => void
onShowArgumentsHelper: () => void
}
Expand All @@ -49,7 +48,7 @@ const EditorControls = ({
keywords: 'compile run',
section: 'Execution',
perform: () => {
onCompileRun('run')
onCompileRun()
},
subtitle: 'Run execution',
priority: Priority.HIGH,
Expand Down Expand Up @@ -120,26 +119,16 @@ const EditorControls = ({
})}
/>

{/* <div> */}
<MultiButton onCompileRun={onCompileRun} />
{/* <div className="flex flex-row gap-x-2"> */}
{/* <Button
<div>
<Button
onClick={onCompileRun}
disabled={isCompileDisabled || !areProgramArgumentsValid}
size="sm"
contentClassName="justify-center"
>
Run
</Button>
<Button
onClick={onProveAndVerify}
disabled={isCompileDisabled || !areProgramArgumentsValid}
size="sm"
contentClassName="justify-center"
>
Prove & Verify
</Button> */}
{/* </div> */}
</div>
</div>
</div>
)
Expand Down
2 changes: 1 addition & 1 deletion components/Editor/EditorFooter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ function EditorFooter({ withoutContent = false }) {
!isFullScreen && 'rounded-b-lg',
)}
>
<span>Cairo Compiler v2.10.0</span>
<span>Cairo Compiler v2.8.0</span>

{isFullScreen && (
<div className="flex items-center justify-end divide-x divide-gray-200 dark:divide-black-500">
Expand Down
88 changes: 39 additions & 49 deletions components/Editor/examples.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ export const Examples: ExampleCode = {
Cairo: [
`use core::felt252;

#[executable]
fn main() -> felt252 {
let n = 2 + 3;
n
Expand All @@ -13,7 +12,6 @@ fn main() -> felt252 {

const my_constant: felt252 = 42;

#[executable]
fn main() {

// non-mutable variable
Expand All @@ -36,27 +34,25 @@ fn main() {

// my_mut_var = 'hello world' <-- fails to compile
}`,
// ,
// `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<T> 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;

fn main() {
let my_felt252 = 10;

// Since a felt252 might not fit in a u8, we need to unwrap the Option<T> 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,
Expand All @@ -65,7 +61,6 @@ enum Direction {
Right
}

#[executable]
fn main() {

// if / else expression
Expand Down Expand Up @@ -131,7 +126,6 @@ fn add(a: u32, b: u32) -> u64 {
}

// This functions doesn't return anything.
#[executable]
fn main() {
let a = 1;
let b = 2;
Expand All @@ -143,30 +137,28 @@ fn main() {
let _z = add(a: x, b: y);
}
`,
// `use array::ArrayTrait;

// #[executable]
// fn main () {
// let mut a = ArrayTrait::new();
`use array::ArrayTrait;

// // add some items in the array
// a.append(1);
// a.append(2);
fn main () {
let mut a = ArrayTrait::new();

// // get array length
// assert!(a.len() == 2, "wrong array length");
// add some items in the array
a.append(1);
a.append(2);

// get array length
assert!(a.len() == 2, "wrong array length");

// // 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
// 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 second_element = *a.at(1);
// a.at(2) will cause an error
}`,
`fn main () {
let mut balances: Felt252Dict<u64> = Default::default();

balances.insert('Alex', 100);
Expand All @@ -190,7 +182,6 @@ fn foo_receives_ref(ref arr: Array<u128>) {
// keeps the ownership of the array.
}

#[executable]
fn main() {
// as the creator of arr, the main function owns the array
let mut arr = ArrayTrait::<u128>::new();
Expand All @@ -206,7 +197,6 @@ fn main() {
}`,
`use core::felt252;

#[executable]
fn main() -> felt252 {
let n = 10;
let result = fib(1, 1, n);
Expand Down Expand Up @@ -504,10 +494,10 @@ ret;
export const CairoExampleNames = [
'Simple',
'Variables & mutability',
// 'Type casting',
'Type casting',
'Control flow',
'Functions',
// 'Arrays',
'Arrays',
'Dictionaries',
'Ownership',
'Fibonacci',
Expand Down
57 changes: 7 additions & 50 deletions components/Editor/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,7 @@ import { Setting, SettingsContext } from 'context/settingsContext'

import { getAbsoluteURL } from 'util/browser'
import { isArgumentStringValid } from 'util/compiler'
import {
codeHighlight,
formatTime,
isEmpty,
objToQueryString,
} from 'util/string'
import { codeHighlight, isEmpty, objToQueryString } from 'util/string'

import { Examples } from 'components/Editor/examples'
import { Tracer } from 'components/Tracer'
Expand All @@ -41,13 +36,11 @@ 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
Expand Down Expand Up @@ -90,10 +83,6 @@ const Editor = ({ readOnly = false, isCairoLangPage = false }: Props) => {
debugMode,
activeSierraIndexes,
setDebugMode,
proof,
proofTime,
verificationTime,
provingIsNotSupported,
} = useContext(CairoVMApiContext)

const { addToConsoleLog, isThreeColumnLayout } = useContext(AppUiContext)
Expand Down Expand Up @@ -258,34 +247,10 @@ 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(
`Proof generation successful (finished in ${formatTime(proofTime)})`,
LogType.Info,
'Runtime error: ' + executionPanicMessage,
LogType.Error,
)
addToConsoleLog(<DownloadProof proof={proof} />, 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)
Expand Down Expand Up @@ -368,18 +333,10 @@ const Editor = ({ readOnly = false, isCairoLangPage = false }: Props) => {
[setProgramArguments],
)

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 handleCompileRun = useCallback(() => {
compileCairoCode(cairoCode, removeExtraWhitespaces(programArguments))
setCompiledCairoCode(cairoCode)
}, [cairoCode, programArguments, compileCairoCode])

const handleCopyPermalink = useCallback(() => {
const params = {
Expand Down
Loading