Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 0 additions & 2 deletions .github/workflows/ci.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,5 @@ jobs:
# TODO: Add '.cargo/config' for list of enabled/disabled `xclippy`lints
- name: Check clippy warnings
run: cargo clippy -- -D warnings
- name: Doctests
run: cargo test --doc --workspace
- name: Cargo-deny
uses: EmbarkStudios/cargo-deny-action@v2
20 changes: 20 additions & 0 deletions .github/workflows/lspec.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
name: "LSpec CI"

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: It's a bit confusing to put the Lean build and test in separate files. I have no preference on splitting Lean and Rust tests into two files vs. combining them into one.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file is auto-generated by LSpec. I'd rather have an entirely separate file just for Lean 4 build and remove the Lean 4 job from ci.yml. At that point, we can rename it to rust_ci.yml

on:
pull_request:
push:
branches:
- main
jobs:
build:
name: Build
runs-on: ubuntu-latest
steps:
- name: install elan
run: |
set -o pipefail
curl -sSfL https://github.com/leanprover/elan/releases/download/v4.0.0/elan-x86_64-unknown-linux-gnu.tar.gz | tar xz

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The elan version will probably get out of date over time, so a workflow to auto-update would be useful. I can make an issue

./elan-init -y --default-toolchain none
echo "$HOME/.elan/bin" >> $GITHUB_PATH
- uses: actions/checkout@v4
- name: run LSpec binary
run: lake exe lspec
26 changes: 26 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,15 +3,19 @@ name = "ix"
version = "0.1.0"
edition = "2021"

[lib]
crate-type = ["staticlib"]

[dependencies]
anyhow = "1"
rustc-hash = "2"
binius_core = { git = "https://gitlab.com/IrreducibleOSS/binius.git", rev = "0e5ec53f260f40fe6afcc741d4ff8f021a66dc1a" }
binius_circuits = { git = "https://gitlab.com/IrreducibleOSS/binius.git", rev = "0e5ec53f260f40fe6afcc741d4ff8f021a66dc1a" }
binius_field = { git = "https://gitlab.com/IrreducibleOSS/binius.git", rev = "0e5ec53f260f40fe6afcc741d4ff8f021a66dc1a" }
binius_macros = { git = "https://gitlab.com/IrreducibleOSS/binius.git", rev = "0e5ec53f260f40fe6afcc741d4ff8f021a66dc1a" }
binius_math = { git = "https://gitlab.com/IrreducibleOSS/binius.git", rev = "0e5ec53f260f40fe6afcc741d4ff8f021a66dc1a" }
blake3 = "1"
bytemuck = "1"
bumpalo = "3"
proptest = "1"
rayon = "1"
rustc-hash = "2"
1 change: 0 additions & 1 deletion Ix/Address.lean
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@

structure Address where
adr : ByteArray
2 changes: 2 additions & 0 deletions Ix/Blake3.lean
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
@[extern "lean_byte_array_blake3"]
opaque ByteArray.blake3 : @& ByteArray → ByteArray
12 changes: 12 additions & 0 deletions Ix/ByteArray.lean
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
namespace ByteArray

def beqNoFFI (a b : ByteArray) : Bool :=
a.data == b.data

@[extern "lean_byte_array_beq"]
def beq : @& ByteArray → @& ByteArray → Bool :=
beqNoFFI

instance : BEq ByteArray := ⟨ByteArray.beq⟩

end ByteArray
5 changes: 0 additions & 5 deletions Ix/Ixon.lean
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@

import Ix.Address
import Lean.Declaration
import Ix.Ixon.Serialize
import Ix.Ixon.Univ
import Ix.Ixon.Expr
import Ix.Ixon.Const




1 change: 0 additions & 1 deletion Ix/Ixon/Const.lean
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@

import Ix.Address
import Lean.Declaration
import Ix.Ixon.Serialize
Expand Down
7 changes: 3 additions & 4 deletions Ix/Ixon/Expr.lean
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@

import Ix.Address
import Lean.Declaration
import Ix.Ixon.Serialize
Expand All@@ -9,7 +8,7 @@ namespace Ixon
-- 0xTTTT_LXXX
inductive Expr where
-- 0x0, ^1
| vari (idx: UInt64) : Expr
| vari (idx: UInt64) : Expr
-- 0x1, {max (add 1 2) (var 1)}
| sort (univ: Univ) : Expr
-- 0x2 #dead_beef_cafe_babe {u1, u2, ... }
Expand All@@ -24,7 +23,7 @@ inductive Expr where
| alls (types: List Expr) (body: Expr) : Expr
-- 0x7 (let d : A in b)
| let_ (type: Expr) (defn: Expr) (body: Expr) : Expr
-- 0x8 .1
-- 0x8 .1
| proj : UInt64 -> Expr -> Expr
-- 0x9 "foobar"
| strl (lit: String) : Expr
Expand All@@ -33,7 +32,7 @@ inductive Expr where
-- array: 0xB
-- const: 0xC

def putExprTag (tag: UInt8) (val: UInt64) : PutM Unit :=
def putExprTag (tag: UInt8) (val: UInt64) : PutM Unit :=
let t := UInt8.shiftLeft tag 4
if val < 8
then putUInt8 (UInt8.lor t (Nat.toUInt8 (UInt64.toNat val))) *> pure ()
Expand Down
3 changes: 1 addition & 2 deletions Ix/Ixon/Serialize.lean
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@

namespace Ixon

class Serialize (A: Type) where
Expand All@@ -13,7 +12,7 @@ structure GetState where

abbrev GetM A := EStateM String GetState A

def runGet (getm: GetM A) (bytes: ByteArray) : Except String A :=
def runGet (getm: GetM A) (bytes: ByteArray) : Except String A :=
match EStateM.run getm { index := 0, bytes } with
| .ok a _ => .ok a
| .error e _ => .error e
Expand Down
4 changes: 3 additions & 1 deletion README.md
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
# ix
# ix

A verifiable computing platform
16 changes: 16 additions & 0 deletions Tests/Blake3.lean
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
import LSpec
import Ix.Blake3

def pairs : List $ (List UInt8 × List UInt8) := [
([0], [ 45, 58, 222, 223, 241, 27, 97, 241,
76, 136, 110, 53, 175, 160, 54, 115,
109, 205, 135, 167, 77, 39, 181, 193,
81, 2, 37, 208, 245, 146, 226, 19,])
]

open LSpec in
def main := lspecIO $
pairs.foldl (init := .done) fun tSeq (i, o) =>
let input := ByteArray.mk ⟨i⟩
let output := ByteArray.mk ⟨o⟩
tSeq ++ (test s!"blake3 on {input}" $ input.blake3.data = output.data)
22 changes: 22 additions & 0 deletions Tests/ByteArray.lean
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
import LSpec
import Ix.ByteArray

def arrays : List ByteArray := [
⟨#[]⟩, ⟨#[1]⟩, ⟨#[0, 3]⟩, ⟨#[1, 1, 1]⟩, ⟨#[3, 3, 3, 3]⟩, ⟨#[13]⟩
]

def arrays' : List ByteArray := [
⟨#[1]⟩, ⟨#[2]⟩, ⟨#[0, 3, 0]⟩, ⟨#[1, 2, 1]⟩, ⟨#[3, 3, 4, 3]⟩, ⟨#[13, 0]⟩
]

open LSpec

def beq : TestSeq :=
arrays.zip arrays |>.foldl (init := .done) fun tSeq (x, y) =>
tSeq ++ (test s!"{x} == {y}" $ x.beq y && x.beqNoFFI y && y.beq x && y.beqNoFFI x)

def neq : TestSeq :=
arrays.zip arrays.reverse |>.foldl (init := .done) fun tSeq (x, y) =>
tSeq ++ (test s!"{x} != {y}" $ !x.beq y && !x.beqNoFFI y && !y.beq x && !y.beqNoFFI x)

def main := lspecIO $ beq ++ neq
1 change: 1 addition & 0 deletions deny.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -92,6 +92,7 @@ allow = [
"MIT",
"Apache-2.0",
"Unicode-3.0",
"BSD-2-Clause",
"BSD-3-Clause",
"CC0-1.0",
"Zlib",
Expand Down
39 changes: 39 additions & 0 deletions ffi.c
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
#include <lean/lean.h>
#include <string.h>

#define intern inline static
#define l_arg b_lean_obj_arg
#define l_res lean_obj_res

// Interfaces targeting Rust implementations

void blake3(uint8_t*, size_t, uint8_t*);

// Auxiliary implementations

intern lean_sarray_object* mk_byte_array(size_t len) {
lean_sarray_object* o = (lean_sarray_object*)lean_alloc_object(
sizeof(lean_sarray_object) + len
);
lean_set_st_header((lean_object*)o, LeanScalarArray, 1);
o->m_size = len;
o->m_capacity = len;
return o;
}

// Implementations to serve Lean 4

extern l_res lean_byte_array_blake3(l_arg a) {
lean_sarray_object* oa = lean_to_sarray(a);
lean_sarray_object* res = mk_byte_array(32);
blake3(res->m_data, oa->m_size, oa->m_data);
return (lean_object*)res;
}

extern bool lean_byte_array_beq(l_arg a, l_arg b) {
lean_sarray_object* oa = lean_to_sarray(a);
lean_sarray_object* ob = lean_to_sarray(b);
size_t sa = oa->m_size;
if (sa == ob->m_size) return memcmp(oa->m_data, ob->m_data, sa) == 0;
return false;
}
12 changes: 11 additions & 1 deletion lake-manifest.json
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
{"version": "1.1.0",
"packagesDir": ".lake/packages",
"packages": [],
"packages":
[{"url": "https://github.com/argumentcomputer/LSpec",
"type": "git",
"subDir": null,
"scope": "",
"rev": "ca8e2803f89f0c12bf9743ae7abbfb2ea6b0eeec",
"name": "LSpec",
"manifestFile": "lake-manifest.json",
"inputRev": "ca8e2803f89f0c12bf9743ae7abbfb2ea6b0eeec",
"inherited": false,
"configFile": "lakefile.toml"}],
"name": "ix",
"lakeDir": ".lake"}
43 changes: 43 additions & 0 deletions lakefile.lean
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
import Lake
open System Lake DSL

package ix where
version := v!"0.1.0"

lean_lib Ix

@[default_target]
lean_exe ix where
root := `Main

require LSpec from git
"https://github.com/argumentcomputer/LSpec" @ "ca8e2803f89f0c12bf9743ae7abbfb2ea6b0eeec"

section Tests

lean_exe Tests.Blake3
lean_exe Tests.ByteArray

end Tests

section FFI

target ffi.o pkg : FilePath := do
let oFile := pkg.buildDir / "ffi.o"
let srcJob ← inputTextFile "ffi.c"
let includeDir ← getLeanIncludeDir
let weakArgs := #["-I", includeDir.toString]
buildO oFile srcJob weakArgs #["-fPIC"] "cc" getLeanTrace

extern_lib liblean_ffi pkg := do
let name := nameToStaticLib "ffi"
let ffiO ← ffi.o.fetch
buildStaticLib (pkg.nativeLibDir / name) #[ffiO]

extern_lib rust_ffi pkg := do
proc { cmd := "cargo", args := #["build", "--release"], cwd := pkg.dir }
let name := nameToStaticLib "ix"
let srcPath := pkg.dir / "target" / "release" / name
return pure srcPath

end FFI
10 changes: 0 additions & 10 deletions lakefile.toml

This file was deleted.

9 changes: 9 additions & 0 deletions src/lib.rs
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
pub mod eiur;

use blake3::hash;

#[no_mangle]
extern "C" fn blake3(mem: &mut [u8; 32], len: usize, input: *const u8) {
unsafe {
*mem = *hash(std::slice::from_raw_parts(input, len)).as_bytes();
}
}

#[cfg(test)]
mod tests {
#[test]
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all \u003cpre\u003e\u003ccode\u003e blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks"); } } catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); } })(); (function(){ try { var __m = "github.com"; var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 0 additions & 2 deletions .github/workflows/ci.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,5 @@ jobs:
# TODO: Add '.cargo/config' for list of enabled/disabled `xclippy`lints
- name: Check clippy warnings
run: cargo clippy -- -D warnings
- name: Doctests
run: cargo test --doc --workspace
- name: Cargo-deny
uses: EmbarkStudios/cargo-deny-action@v2
20 changes: 20 additions & 0 deletions .github/workflows/lspec.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
name: "LSpec CI"

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: It's a bit confusing to put the Lean build and test in separate files. I have no preference on splitting Lean and Rust tests into two files vs. combining them into one.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file is auto-generated by LSpec. I'd rather have an entirely separate file just for Lean 4 build and remove the Lean 4 job from ci.yml. At that point, we can rename it to rust_ci.yml

on:
pull_request:
push:
branches:
- main
jobs:
build:
name: Build
runs-on: ubuntu-latest
steps:
- name: install elan
run: |
set -o pipefail
curl -sSfL https://github.com/leanprover/elan/releases/download/v4.0.0/elan-x86_64-unknown-linux-gnu.tar.gz | tar xz

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The elan version will probably get out of date over time, so a workflow to auto-update would be useful. I can make an issue

./elan-init -y --default-toolchain none
echo "$HOME/.elan/bin" >> $GITHUB_PATH
- uses: actions/checkout@v4
- name: run LSpec binary
run: lake exe lspec
26 changes: 26 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,15 +3,19 @@ name = "ix"
version = "0.1.0"
edition = "2021"

[lib]
crate-type = ["staticlib"]

[dependencies]
anyhow = "1"
rustc-hash = "2"
binius_core = { git = "https://gitlab.com/IrreducibleOSS/binius.git", rev = "0e5ec53f260f40fe6afcc741d4ff8f021a66dc1a" }
binius_circuits = { git = "https://gitlab.com/IrreducibleOSS/binius.git", rev = "0e5ec53f260f40fe6afcc741d4ff8f021a66dc1a" }
binius_field = { git = "https://gitlab.com/IrreducibleOSS/binius.git", rev = "0e5ec53f260f40fe6afcc741d4ff8f021a66dc1a" }
binius_macros = { git = "https://gitlab.com/IrreducibleOSS/binius.git", rev = "0e5ec53f260f40fe6afcc741d4ff8f021a66dc1a" }
binius_math = { git = "https://gitlab.com/IrreducibleOSS/binius.git", rev = "0e5ec53f260f40fe6afcc741d4ff8f021a66dc1a" }
blake3 = "1"
bytemuck = "1"
bumpalo = "3"
proptest = "1"
rayon = "1"
rustc-hash = "2"
1 change: 0 additions & 1 deletion Ix/Address.lean
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@

structure Address where
adr : ByteArray
2 changes: 2 additions & 0 deletions Ix/Blake3.lean
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
@[extern "lean_byte_array_blake3"]
opaque ByteArray.blake3 : @& ByteArray → ByteArray
12 changes: 12 additions & 0 deletions Ix/ByteArray.lean
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
namespace ByteArray

def beqNoFFI (a b : ByteArray) : Bool :=
a.data == b.data

@[extern "lean_byte_array_beq"]
def beq : @& ByteArray → @& ByteArray → Bool :=
beqNoFFI

instance : BEq ByteArray := ⟨ByteArray.beq⟩

end ByteArray
5 changes: 0 additions & 5 deletions Ix/Ixon.lean
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@

import Ix.Address
import Lean.Declaration
import Ix.Ixon.Serialize
import Ix.Ixon.Univ
import Ix.Ixon.Expr
import Ix.Ixon.Const




1 change: 0 additions & 1 deletion Ix/Ixon/Const.lean
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@

import Ix.Address
import Lean.Declaration
import Ix.Ixon.Serialize
Expand Down
7 changes: 3 additions & 4 deletions Ix/Ixon/Expr.lean
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@

import Ix.Address
import Lean.Declaration
import Ix.Ixon.Serialize
Expand All@@ -9,7 +8,7 @@ namespace Ixon
-- 0xTTTT_LXXX
inductive Expr where
-- 0x0, ^1
| vari (idx: UInt64) : Expr
| vari (idx: UInt64) : Expr
-- 0x1, {max (add 1 2) (var 1)}
| sort (univ: Univ) : Expr
-- 0x2 #dead_beef_cafe_babe {u1, u2, ... }
Expand All@@ -24,7 +23,7 @@ inductive Expr where
| alls (types: List Expr) (body: Expr) : Expr
-- 0x7 (let d : A in b)
| let_ (type: Expr) (defn: Expr) (body: Expr) : Expr
-- 0x8 .1
-- 0x8 .1
| proj : UInt64 -> Expr -> Expr
-- 0x9 "foobar"
| strl (lit: String) : Expr
Expand All@@ -33,7 +32,7 @@ inductive Expr where
-- array: 0xB
-- const: 0xC

def putExprTag (tag: UInt8) (val: UInt64) : PutM Unit :=
def putExprTag (tag: UInt8) (val: UInt64) : PutM Unit :=
let t := UInt8.shiftLeft tag 4
if val < 8
then putUInt8 (UInt8.lor t (Nat.toUInt8 (UInt64.toNat val))) *> pure ()
Expand Down
3 changes: 1 addition & 2 deletions Ix/Ixon/Serialize.lean
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@

namespace Ixon

class Serialize (A: Type) where
Expand All@@ -13,7 +12,7 @@ structure GetState where

abbrev GetM A := EStateM String GetState A

def runGet (getm: GetM A) (bytes: ByteArray) : Except String A :=
def runGet (getm: GetM A) (bytes: ByteArray) : Except String A :=
match EStateM.run getm { index := 0, bytes } with
| .ok a _ => .ok a
| .error e _ => .error e
Expand Down
4 changes: 3 additions & 1 deletion README.md
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
# ix
# ix

A verifiable computing platform
16 changes: 16 additions & 0 deletions Tests/Blake3.lean
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
import LSpec
import Ix.Blake3

def pairs : List $ (List UInt8 × List UInt8) := [
([0], [ 45, 58, 222, 223, 241, 27, 97, 241,
76, 136, 110, 53, 175, 160, 54, 115,
109, 205, 135, 167, 77, 39, 181, 193,
81, 2, 37, 208, 245, 146, 226, 19,])
]

open LSpec in
def main := lspecIO $
pairs.foldl (init := .done) fun tSeq (i, o) =>
let input := ByteArray.mk ⟨i⟩
let output := ByteArray.mk ⟨o⟩
tSeq ++ (test s!"blake3 on {input}" $ input.blake3.data = output.data)
22 changes: 22 additions & 0 deletions Tests/ByteArray.lean
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
import LSpec
import Ix.ByteArray

def arrays : List ByteArray := [
⟨#[]⟩, ⟨#[1]⟩, ⟨#[0, 3]⟩, ⟨#[1, 1, 1]⟩, ⟨#[3, 3, 3, 3]⟩, ⟨#[13]⟩
]

def arrays' : List ByteArray := [
⟨#[1]⟩, ⟨#[2]⟩, ⟨#[0, 3, 0]⟩, ⟨#[1, 2, 1]⟩, ⟨#[3, 3, 4, 3]⟩, ⟨#[13, 0]⟩
]

open LSpec

def beq : TestSeq :=
arrays.zip arrays |>.foldl (init := .done) fun tSeq (x, y) =>
tSeq ++ (test s!"{x} == {y}" $ x.beq y && x.beqNoFFI y && y.beq x && y.beqNoFFI x)

def neq : TestSeq :=
arrays.zip arrays.reverse |>.foldl (init := .done) fun tSeq (x, y) =>
tSeq ++ (test s!"{x} != {y}" $ !x.beq y && !x.beqNoFFI y && !y.beq x && !y.beqNoFFI x)

def main := lspecIO $ beq ++ neq
1 change: 1 addition & 0 deletions deny.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -92,6 +92,7 @@ allow = [
"MIT",
"Apache-2.0",
"Unicode-3.0",
"BSD-2-Clause",
"BSD-3-Clause",
"CC0-1.0",
"Zlib",
Expand Down
39 changes: 39 additions & 0 deletions ffi.c
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
#include <lean/lean.h>
#include <string.h>

#define intern inline static
#define l_arg b_lean_obj_arg
#define l_res lean_obj_res

// Interfaces targeting Rust implementations

void blake3(uint8_t*, size_t, uint8_t*);

// Auxiliary implementations

intern lean_sarray_object* mk_byte_array(size_t len) {
lean_sarray_object* o = (lean_sarray_object*)lean_alloc_object(
sizeof(lean_sarray_object) + len
);
lean_set_st_header((lean_object*)o, LeanScalarArray, 1);
o->m_size = len;
o->m_capacity = len;
return o;
}

// Implementations to serve Lean 4

extern l_res lean_byte_array_blake3(l_arg a) {
lean_sarray_object* oa = lean_to_sarray(a);
lean_sarray_object* res = mk_byte_array(32);
blake3(res->m_data, oa->m_size, oa->m_data);
return (lean_object*)res;
}

extern bool lean_byte_array_beq(l_arg a, l_arg b) {
lean_sarray_object* oa = lean_to_sarray(a);
lean_sarray_object* ob = lean_to_sarray(b);
size_t sa = oa->m_size;
if (sa == ob->m_size) return memcmp(oa->m_data, ob->m_data, sa) == 0;
return false;
}
12 changes: 11 additions & 1 deletion lake-manifest.json
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
{"version": "1.1.0",
"packagesDir": ".lake/packages",
"packages": [],
"packages":
[{"url": "https://github.com/argumentcomputer/LSpec",
"type": "git",
"subDir": null,
"scope": "",
"rev": "ca8e2803f89f0c12bf9743ae7abbfb2ea6b0eeec",
"name": "LSpec",
"manifestFile": "lake-manifest.json",
"inputRev": "ca8e2803f89f0c12bf9743ae7abbfb2ea6b0eeec",
"inherited": false,
"configFile": "lakefile.toml"}],
"name": "ix",
"lakeDir": ".lake"}
43 changes: 43 additions & 0 deletions lakefile.lean
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
import Lake
open System Lake DSL

package ix where
version := v!"0.1.0"

lean_lib Ix

@[default_target]
lean_exe ix where
root := `Main

require LSpec from git
"https://github.com/argumentcomputer/LSpec" @ "ca8e2803f89f0c12bf9743ae7abbfb2ea6b0eeec"

section Tests

lean_exe Tests.Blake3
lean_exe Tests.ByteArray

end Tests

section FFI

target ffi.o pkg : FilePath := do
let oFile := pkg.buildDir / "ffi.o"
let srcJob ← inputTextFile "ffi.c"
let includeDir ← getLeanIncludeDir
let weakArgs := #["-I", includeDir.toString]
buildO oFile srcJob weakArgs #["-fPIC"] "cc" getLeanTrace

extern_lib liblean_ffi pkg := do
let name := nameToStaticLib "ffi"
let ffiO ← ffi.o.fetch
buildStaticLib (pkg.nativeLibDir / name) #[ffiO]

extern_lib rust_ffi pkg := do
proc { cmd := "cargo", args := #["build", "--release"], cwd := pkg.dir }
let name := nameToStaticLib "ix"
let srcPath := pkg.dir / "target" / "release" / name
return pure srcPath

end FFI
10 changes: 0 additions & 10 deletions lakefile.toml

This file was deleted.

9 changes: 9 additions & 0 deletions src/lib.rs
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
pub mod eiur;

use blake3::hash;

#[no_mangle]
extern "C" fn blake3(mem: &mut [u8; 32], len: usize, input: *const u8) {
unsafe {
*mem = *hash(std::slice::from_raw_parts(input, len)).as_bytes();
}
}

#[cfg(test)]
mod tests {
#[test]
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 0 additions & 2 deletions .github/workflows/ci.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,5 @@ jobs:
# TODO: Add '.cargo/config' for list of enabled/disabled `xclippy`lints
- name: Check clippy warnings
run: cargo clippy -- -D warnings
- name: Doctests
run: cargo test --doc --workspace
- name: Cargo-deny
uses: EmbarkStudios/cargo-deny-action@v2
20 changes: 20 additions & 0 deletions .github/workflows/lspec.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
name: "LSpec CI"

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: It's a bit confusing to put the Lean build and test in separate files. I have no preference on splitting Lean and Rust tests into two files vs. combining them into one.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file is auto-generated by LSpec. I'd rather have an entirely separate file just for Lean 4 build and remove the Lean 4 job from ci.yml. At that point, we can rename it to rust_ci.yml

on:
pull_request:
push:
branches:
- main
jobs:
build:
name: Build
runs-on: ubuntu-latest
steps:
- name: install elan
run: |
set -o pipefail
curl -sSfL https://github.com/leanprover/elan/releases/download/v4.0.0/elan-x86_64-unknown-linux-gnu.tar.gz | tar xz

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The elan version will probably get out of date over time, so a workflow to auto-update would be useful. I can make an issue

./elan-init -y --default-toolchain none
echo "$HOME/.elan/bin" >> $GITHUB_PATH
- uses: actions/checkout@v4
- name: run LSpec binary
run: lake exe lspec
26 changes: 26 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,15 +3,19 @@ name = "ix"
version = "0.1.0"
edition = "2021"

[lib]
crate-type = ["staticlib"]

[dependencies]
anyhow = "1"
rustc-hash = "2"
binius_core = { git = "https://gitlab.com/IrreducibleOSS/binius.git", rev = "0e5ec53f260f40fe6afcc741d4ff8f021a66dc1a" }
binius_circuits = { git = "https://gitlab.com/IrreducibleOSS/binius.git", rev = "0e5ec53f260f40fe6afcc741d4ff8f021a66dc1a" }
binius_field = { git = "https://gitlab.com/IrreducibleOSS/binius.git", rev = "0e5ec53f260f40fe6afcc741d4ff8f021a66dc1a" }
binius_macros = { git = "https://gitlab.com/IrreducibleOSS/binius.git", rev = "0e5ec53f260f40fe6afcc741d4ff8f021a66dc1a" }
binius_math = { git = "https://gitlab.com/IrreducibleOSS/binius.git", rev = "0e5ec53f260f40fe6afcc741d4ff8f021a66dc1a" }
blake3 = "1"
bytemuck = "1"
bumpalo = "3"
proptest = "1"
rayon = "1"
rustc-hash = "2"
1 change: 0 additions & 1 deletion Ix/Address.lean
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@

structure Address where
adr : ByteArray
2 changes: 2 additions & 0 deletions Ix/Blake3.lean
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
@[extern "lean_byte_array_blake3"]
opaque ByteArray.blake3 : @& ByteArray → ByteArray
12 changes: 12 additions & 0 deletions Ix/ByteArray.lean
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
namespace ByteArray

def beqNoFFI (a b : ByteArray) : Bool :=
a.data == b.data

@[extern "lean_byte_array_beq"]
def beq : @& ByteArray → @& ByteArray → Bool :=
beqNoFFI

instance : BEq ByteArray := ⟨ByteArray.beq⟩

end ByteArray
5 changes: 0 additions & 5 deletions Ix/Ixon.lean
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@

import Ix.Address
import Lean.Declaration
import Ix.Ixon.Serialize
import Ix.Ixon.Univ
import Ix.Ixon.Expr
import Ix.Ixon.Const




1 change: 0 additions & 1 deletion Ix/Ixon/Const.lean
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@

import Ix.Address
import Lean.Declaration
import Ix.Ixon.Serialize
Expand Down
7 changes: 3 additions & 4 deletions Ix/Ixon/Expr.lean
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@

import Ix.Address
import Lean.Declaration
import Ix.Ixon.Serialize
Expand All@@ -9,7 +8,7 @@ namespace Ixon
-- 0xTTTT_LXXX
inductive Expr where
-- 0x0, ^1
| vari (idx: UInt64) : Expr
| vari (idx: UInt64) : Expr
-- 0x1, {max (add 1 2) (var 1)}
| sort (univ: Univ) : Expr
-- 0x2 #dead_beef_cafe_babe {u1, u2, ... }
Expand All@@ -24,7 +23,7 @@ inductive Expr where
| alls (types: List Expr) (body: Expr) : Expr
-- 0x7 (let d : A in b)
| let_ (type: Expr) (defn: Expr) (body: Expr) : Expr
-- 0x8 .1
-- 0x8 .1
| proj : UInt64 -> Expr -> Expr
-- 0x9 "foobar"
| strl (lit: String) : Expr
Expand All@@ -33,7 +32,7 @@ inductive Expr where
-- array: 0xB
-- const: 0xC

def putExprTag (tag: UInt8) (val: UInt64) : PutM Unit :=
def putExprTag (tag: UInt8) (val: UInt64) : PutM Unit :=
let t := UInt8.shiftLeft tag 4
if val < 8
then putUInt8 (UInt8.lor t (Nat.toUInt8 (UInt64.toNat val))) *> pure ()
Expand Down
3 changes: 1 addition & 2 deletions Ix/Ixon/Serialize.lean
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@

namespace Ixon

class Serialize (A: Type) where
Expand All@@ -13,7 +12,7 @@ structure GetState where

abbrev GetM A := EStateM String GetState A

def runGet (getm: GetM A) (bytes: ByteArray) : Except String A :=
def runGet (getm: GetM A) (bytes: ByteArray) : Except String A :=
match EStateM.run getm { index := 0, bytes } with
| .ok a _ => .ok a
| .error e _ => .error e
Expand Down
4 changes: 3 additions & 1 deletion README.md
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
# ix
# ix

A verifiable computing platform
16 changes: 16 additions & 0 deletions Tests/Blake3.lean
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
import LSpec
import Ix.Blake3

def pairs : List $ (List UInt8 × List UInt8) := [
([0], [ 45, 58, 222, 223, 241, 27, 97, 241,
76, 136, 110, 53, 175, 160, 54, 115,
109, 205, 135, 167, 77, 39, 181, 193,
81, 2, 37, 208, 245, 146, 226, 19,])
]

open LSpec in
def main := lspecIO $
pairs.foldl (init := .done) fun tSeq (i, o) =>
let input := ByteArray.mk ⟨i⟩
let output := ByteArray.mk ⟨o⟩
tSeq ++ (test s!"blake3 on {input}" $ input.blake3.data = output.data)
22 changes: 22 additions & 0 deletions Tests/ByteArray.lean
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
import LSpec
import Ix.ByteArray

def arrays : List ByteArray := [
⟨#[]⟩, ⟨#[1]⟩, ⟨#[0, 3]⟩, ⟨#[1, 1, 1]⟩, ⟨#[3, 3, 3, 3]⟩, ⟨#[13]⟩
]

def arrays' : List ByteArray := [
⟨#[1]⟩, ⟨#[2]⟩, ⟨#[0, 3, 0]⟩, ⟨#[1, 2, 1]⟩, ⟨#[3, 3, 4, 3]⟩, ⟨#[13, 0]⟩
]

open LSpec

def beq : TestSeq :=
arrays.zip arrays |>.foldl (init := .done) fun tSeq (x, y) =>
tSeq ++ (test s!"{x} == {y}" $ x.beq y && x.beqNoFFI y && y.beq x && y.beqNoFFI x)

def neq : TestSeq :=
arrays.zip arrays.reverse |>.foldl (init := .done) fun tSeq (x, y) =>
tSeq ++ (test s!"{x} != {y}" $ !x.beq y && !x.beqNoFFI y && !y.beq x && !y.beqNoFFI x)

def main := lspecIO $ beq ++ neq
1 change: 1 addition & 0 deletions deny.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -92,6 +92,7 @@ allow = [
"MIT",
"Apache-2.0",
"Unicode-3.0",
"BSD-2-Clause",
"BSD-3-Clause",
"CC0-1.0",
"Zlib",
Expand Down
39 changes: 39 additions & 0 deletions ffi.c
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
#include <lean/lean.h>
#include <string.h>

#define intern inline static
#define l_arg b_lean_obj_arg
#define l_res lean_obj_res

// Interfaces targeting Rust implementations

void blake3(uint8_t*, size_t, uint8_t*);

// Auxiliary implementations

intern lean_sarray_object* mk_byte_array(size_t len) {
lean_sarray_object* o = (lean_sarray_object*)lean_alloc_object(
sizeof(lean_sarray_object) + len
);
lean_set_st_header((lean_object*)o, LeanScalarArray, 1);
o->m_size = len;
o->m_capacity = len;
return o;
}

// Implementations to serve Lean 4

extern l_res lean_byte_array_blake3(l_arg a) {
lean_sarray_object* oa = lean_to_sarray(a);
lean_sarray_object* res = mk_byte_array(32);
blake3(res->m_data, oa->m_size, oa->m_data);
return (lean_object*)res;
}

extern bool lean_byte_array_beq(l_arg a, l_arg b) {
lean_sarray_object* oa = lean_to_sarray(a);
lean_sarray_object* ob = lean_to_sarray(b);
size_t sa = oa->m_size;
if (sa == ob->m_size) return memcmp(oa->m_data, ob->m_data, sa) == 0;
return false;
}
12 changes: 11 additions & 1 deletion lake-manifest.json
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
{"version": "1.1.0",
"packagesDir": ".lake/packages",
"packages": [],
"packages":
[{"url": "https://github.com/argumentcomputer/LSpec",
"type": "git",
"subDir": null,
"scope": "",
"rev": "ca8e2803f89f0c12bf9743ae7abbfb2ea6b0eeec",
"name": "LSpec",
"manifestFile": "lake-manifest.json",
"inputRev": "ca8e2803f89f0c12bf9743ae7abbfb2ea6b0eeec",
"inherited": false,
"configFile": "lakefile.toml"}],
"name": "ix",
"lakeDir": ".lake"}
43 changes: 43 additions & 0 deletions lakefile.lean
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
import Lake
open System Lake DSL

package ix where
version := v!"0.1.0"

lean_lib Ix

@[default_target]
lean_exe ix where
root := `Main

require LSpec from git
"https://github.com/argumentcomputer/LSpec" @ "ca8e2803f89f0c12bf9743ae7abbfb2ea6b0eeec"

section Tests

lean_exe Tests.Blake3
lean_exe Tests.ByteArray

end Tests

section FFI

target ffi.o pkg : FilePath := do
let oFile := pkg.buildDir / "ffi.o"
let srcJob ← inputTextFile "ffi.c"
let includeDir ← getLeanIncludeDir
let weakArgs := #["-I", includeDir.toString]
buildO oFile srcJob weakArgs #["-fPIC"] "cc" getLeanTrace

extern_lib liblean_ffi pkg := do
let name := nameToStaticLib "ffi"
let ffiO ← ffi.o.fetch
buildStaticLib (pkg.nativeLibDir / name) #[ffiO]

extern_lib rust_ffi pkg := do
proc { cmd := "cargo", args := #["build", "--release"], cwd := pkg.dir }
let name := nameToStaticLib "ix"
let srcPath := pkg.dir / "target" / "release" / name
return pure srcPath

end FFI
10 changes: 0 additions & 10 deletions lakefile.toml

This file was deleted.

9 changes: 9 additions & 0 deletions src/lib.rs
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
pub mod eiur;

use blake3::hash;

#[no_mangle]
extern "C" fn blake3(mem: &mut [u8; 32], len: usize, input: *const u8) {
unsafe {
*mem = *hash(std::slice::from_raw_parts(input, len)).as_bytes();
}
}

#[cfg(test)]
mod tests {
#[test]
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length \u003e 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 0 additions & 2 deletions .github/workflows/ci.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,5 @@ jobs:
# TODO: Add '.cargo/config' for list of enabled/disabled `xclippy`lints
- name: Check clippy warnings
run: cargo clippy -- -D warnings
- name: Doctests
run: cargo test --doc --workspace
- name: Cargo-deny
uses: EmbarkStudios/cargo-deny-action@v2
20 changes: 20 additions & 0 deletions .github/workflows/lspec.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
name: "LSpec CI"

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: It's a bit confusing to put the Lean build and test in separate files. I have no preference on splitting Lean and Rust tests into two files vs. combining them into one.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file is auto-generated by LSpec. I'd rather have an entirely separate file just for Lean 4 build and remove the Lean 4 job from ci.yml. At that point, we can rename it to rust_ci.yml

on:
pull_request:
push:
branches:
- main
jobs:
build:
name: Build
runs-on: ubuntu-latest
steps:
- name: install elan
run: |
set -o pipefail
curl -sSfL https://github.com/leanprover/elan/releases/download/v4.0.0/elan-x86_64-unknown-linux-gnu.tar.gz | tar xz

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The elan version will probably get out of date over time, so a workflow to auto-update would be useful. I can make an issue

./elan-init -y --default-toolchain none
echo "$HOME/.elan/bin" >> $GITHUB_PATH
- uses: actions/checkout@v4
- name: run LSpec binary
run: lake exe lspec
26 changes: 26 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,15 +3,19 @@ name = "ix"
version = "0.1.0"
edition = "2021"

[lib]
crate-type = ["staticlib"]

[dependencies]
anyhow = "1"
rustc-hash = "2"
binius_core = { git = "https://gitlab.com/IrreducibleOSS/binius.git", rev = "0e5ec53f260f40fe6afcc741d4ff8f021a66dc1a" }
binius_circuits = { git = "https://gitlab.com/IrreducibleOSS/binius.git", rev = "0e5ec53f260f40fe6afcc741d4ff8f021a66dc1a" }
binius_field = { git = "https://gitlab.com/IrreducibleOSS/binius.git", rev = "0e5ec53f260f40fe6afcc741d4ff8f021a66dc1a" }
binius_macros = { git = "https://gitlab.com/IrreducibleOSS/binius.git", rev = "0e5ec53f260f40fe6afcc741d4ff8f021a66dc1a" }
binius_math = { git = "https://gitlab.com/IrreducibleOSS/binius.git", rev = "0e5ec53f260f40fe6afcc741d4ff8f021a66dc1a" }
blake3 = "1"
bytemuck = "1"
bumpalo = "3"
proptest = "1"
rayon = "1"
rustc-hash = "2"
1 change: 0 additions & 1 deletion Ix/Address.lean
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@

structure Address where
adr : ByteArray
2 changes: 2 additions & 0 deletions Ix/Blake3.lean
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
@[extern "lean_byte_array_blake3"]
opaque ByteArray.blake3 : @& ByteArray → ByteArray
12 changes: 12 additions & 0 deletions Ix/ByteArray.lean
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
namespace ByteArray

def beqNoFFI (a b : ByteArray) : Bool :=
a.data == b.data

@[extern "lean_byte_array_beq"]
def beq : @& ByteArray → @& ByteArray → Bool :=
beqNoFFI

instance : BEq ByteArray := ⟨ByteArray.beq⟩

end ByteArray
5 changes: 0 additions & 5 deletions Ix/Ixon.lean
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@

import Ix.Address
import Lean.Declaration
import Ix.Ixon.Serialize
import Ix.Ixon.Univ
import Ix.Ixon.Expr
import Ix.Ixon.Const




1 change: 0 additions & 1 deletion Ix/Ixon/Const.lean
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@

import Ix.Address
import Lean.Declaration
import Ix.Ixon.Serialize
Expand Down
7 changes: 3 additions & 4 deletions Ix/Ixon/Expr.lean
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@

import Ix.Address
import Lean.Declaration
import Ix.Ixon.Serialize
Expand All@@ -9,7 +8,7 @@ namespace Ixon
-- 0xTTTT_LXXX
inductive Expr where
-- 0x0, ^1
| vari (idx: UInt64) : Expr
| vari (idx: UInt64) : Expr
-- 0x1, {max (add 1 2) (var 1)}
| sort (univ: Univ) : Expr
-- 0x2 #dead_beef_cafe_babe {u1, u2, ... }
Expand All@@ -24,7 +23,7 @@ inductive Expr where
| alls (types: List Expr) (body: Expr) : Expr
-- 0x7 (let d : A in b)
| let_ (type: Expr) (defn: Expr) (body: Expr) : Expr
-- 0x8 .1
-- 0x8 .1
| proj : UInt64 -> Expr -> Expr
-- 0x9 "foobar"
| strl (lit: String) : Expr
Expand All@@ -33,7 +32,7 @@ inductive Expr where
-- array: 0xB
-- const: 0xC

def putExprTag (tag: UInt8) (val: UInt64) : PutM Unit :=
def putExprTag (tag: UInt8) (val: UInt64) : PutM Unit :=
let t := UInt8.shiftLeft tag 4
if val < 8
then putUInt8 (UInt8.lor t (Nat.toUInt8 (UInt64.toNat val))) *> pure ()
Expand Down
3 changes: 1 addition & 2 deletions Ix/Ixon/Serialize.lean
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@

namespace Ixon

class Serialize (A: Type) where
Expand All@@ -13,7 +12,7 @@ structure GetState where

abbrev GetM A := EStateM String GetState A

def runGet (getm: GetM A) (bytes: ByteArray) : Except String A :=
def runGet (getm: GetM A) (bytes: ByteArray) : Except String A :=
match EStateM.run getm { index := 0, bytes } with
| .ok a _ => .ok a
| .error e _ => .error e
Expand Down
4 changes: 3 additions & 1 deletion README.md
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
# ix
# ix

A verifiable computing platform
16 changes: 16 additions & 0 deletions Tests/Blake3.lean
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
import LSpec
import Ix.Blake3

def pairs : List $ (List UInt8 × List UInt8) := [
([0], [ 45, 58, 222, 223, 241, 27, 97, 241,
76, 136, 110, 53, 175, 160, 54, 115,
109, 205, 135, 167, 77, 39, 181, 193,
81, 2, 37, 208, 245, 146, 226, 19,])
]

open LSpec in
def main := lspecIO $
pairs.foldl (init := .done) fun tSeq (i, o) =>
let input := ByteArray.mk ⟨i⟩
let output := ByteArray.mk ⟨o⟩
tSeq ++ (test s!"blake3 on {input}" $ input.blake3.data = output.data)
22 changes: 22 additions & 0 deletions Tests/ByteArray.lean
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
import LSpec
import Ix.ByteArray

def arrays : List ByteArray := [
⟨#[]⟩, ⟨#[1]⟩, ⟨#[0, 3]⟩, ⟨#[1, 1, 1]⟩, ⟨#[3, 3, 3, 3]⟩, ⟨#[13]⟩
]

def arrays' : List ByteArray := [
⟨#[1]⟩, ⟨#[2]⟩, ⟨#[0, 3, 0]⟩, ⟨#[1, 2, 1]⟩, ⟨#[3, 3, 4, 3]⟩, ⟨#[13, 0]⟩
]

open LSpec

def beq : TestSeq :=
arrays.zip arrays |>.foldl (init := .done) fun tSeq (x, y) =>
tSeq ++ (test s!"{x} == {y}" $ x.beq y && x.beqNoFFI y && y.beq x && y.beqNoFFI x)

def neq : TestSeq :=
arrays.zip arrays.reverse |>.foldl (init := .done) fun tSeq (x, y) =>
tSeq ++ (test s!"{x} != {y}" $ !x.beq y && !x.beqNoFFI y && !y.beq x && !y.beqNoFFI x)

def main := lspecIO $ beq ++ neq
1 change: 1 addition & 0 deletions deny.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -92,6 +92,7 @@ allow = [
"MIT",
"Apache-2.0",
"Unicode-3.0",
"BSD-2-Clause",
"BSD-3-Clause",
"CC0-1.0",
"Zlib",
Expand Down
39 changes: 39 additions & 0 deletions ffi.c
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
#include <lean/lean.h>
#include <string.h>

#define intern inline static
#define l_arg b_lean_obj_arg
#define l_res lean_obj_res

// Interfaces targeting Rust implementations

void blake3(uint8_t*, size_t, uint8_t*);

// Auxiliary implementations

intern lean_sarray_object* mk_byte_array(size_t len) {
lean_sarray_object* o = (lean_sarray_object*)lean_alloc_object(
sizeof(lean_sarray_object) + len
);
lean_set_st_header((lean_object*)o, LeanScalarArray, 1);
o->m_size = len;
o->m_capacity = len;
return o;
}

// Implementations to serve Lean 4

extern l_res lean_byte_array_blake3(l_arg a) {
lean_sarray_object* oa = lean_to_sarray(a);
lean_sarray_object* res = mk_byte_array(32);
blake3(res->m_data, oa->m_size, oa->m_data);
return (lean_object*)res;
}

extern bool lean_byte_array_beq(l_arg a, l_arg b) {
lean_sarray_object* oa = lean_to_sarray(a);
lean_sarray_object* ob = lean_to_sarray(b);
size_t sa = oa->m_size;
if (sa == ob->m_size) return memcmp(oa->m_data, ob->m_data, sa) == 0;
return false;
}
12 changes: 11 additions & 1 deletion lake-manifest.json
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
{"version": "1.1.0",
"packagesDir": ".lake/packages",
"packages": [],
"packages":
[{"url": "https://github.com/argumentcomputer/LSpec",
"type": "git",
"subDir": null,
"scope": "",
"rev": "ca8e2803f89f0c12bf9743ae7abbfb2ea6b0eeec",
"name": "LSpec",
"manifestFile": "lake-manifest.json",
"inputRev": "ca8e2803f89f0c12bf9743ae7abbfb2ea6b0eeec",
"inherited": false,
"configFile": "lakefile.toml"}],
"name": "ix",
"lakeDir": ".lake"}
43 changes: 43 additions & 0 deletions lakefile.lean
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
import Lake
open System Lake DSL

package ix where
version := v!"0.1.0"

lean_lib Ix

@[default_target]
lean_exe ix where
root := `Main

require LSpec from git
"https://github.com/argumentcomputer/LSpec" @ "ca8e2803f89f0c12bf9743ae7abbfb2ea6b0eeec"

section Tests

lean_exe Tests.Blake3
lean_exe Tests.ByteArray

end Tests

section FFI

target ffi.o pkg : FilePath := do
let oFile := pkg.buildDir / "ffi.o"
let srcJob ← inputTextFile "ffi.c"
let includeDir ← getLeanIncludeDir
let weakArgs := #["-I", includeDir.toString]
buildO oFile srcJob weakArgs #["-fPIC"] "cc" getLeanTrace

extern_lib liblean_ffi pkg := do
let name := nameToStaticLib "ffi"
let ffiO ← ffi.o.fetch
buildStaticLib (pkg.nativeLibDir / name) #[ffiO]

extern_lib rust_ffi pkg := do
proc { cmd := "cargo", args := #["build", "--release"], cwd := pkg.dir }
let name := nameToStaticLib "ix"
let srcPath := pkg.dir / "target" / "release" / name
return pure srcPath

end FFI
10 changes: 0 additions & 10 deletions lakefile.toml

This file was deleted.

9 changes: 9 additions & 0 deletions src/lib.rs
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
pub mod eiur;

use blake3::hash;

#[no_mangle]
extern "C" fn blake3(mem: &mut [u8; 32], len: usize, input: *const u8) {
unsafe {
*mem = *hash(std::slice::from_raw_parts(input, len)).as_bytes();
}
}

#[cfg(test)]
mod tests {
#[test]
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 0 additions & 2 deletions .github/workflows/ci.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,5 @@ jobs:
# TODO: Add '.cargo/config' for list of enabled/disabled `xclippy`lints
- name: Check clippy warnings
run: cargo clippy -- -D warnings
- name: Doctests
run: cargo test --doc --workspace
- name: Cargo-deny
uses: EmbarkStudios/cargo-deny-action@v2
20 changes: 20 additions & 0 deletions .github/workflows/lspec.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
name: "LSpec CI"

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: It's a bit confusing to put the Lean build and test in separate files. I have no preference on splitting Lean and Rust tests into two files vs. combining them into one.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file is auto-generated by LSpec. I'd rather have an entirely separate file just for Lean 4 build and remove the Lean 4 job from ci.yml. At that point, we can rename it to rust_ci.yml

on:
pull_request:
push:
branches:
- main
jobs:
build:
name: Build
runs-on: ubuntu-latest
steps:
- name: install elan
run: |
set -o pipefail
curl -sSfL https://github.com/leanprover/elan/releases/download/v4.0.0/elan-x86_64-unknown-linux-gnu.tar.gz | tar xz

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The elan version will probably get out of date over time, so a workflow to auto-update would be useful. I can make an issue

./elan-init -y --default-toolchain none
echo "$HOME/.elan/bin" >> $GITHUB_PATH
- uses: actions/checkout@v4
- name: run LSpec binary
run: lake exe lspec
26 changes: 26 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,15 +3,19 @@ name = "ix"
version = "0.1.0"
edition = "2021"

[lib]
crate-type = ["staticlib"]

[dependencies]
anyhow = "1"
rustc-hash = "2"
binius_core = { git = "https://gitlab.com/IrreducibleOSS/binius.git", rev = "0e5ec53f260f40fe6afcc741d4ff8f021a66dc1a" }
binius_circuits = { git = "https://gitlab.com/IrreducibleOSS/binius.git", rev = "0e5ec53f260f40fe6afcc741d4ff8f021a66dc1a" }
binius_field = { git = "https://gitlab.com/IrreducibleOSS/binius.git", rev = "0e5ec53f260f40fe6afcc741d4ff8f021a66dc1a" }
binius_macros = { git = "https://gitlab.com/IrreducibleOSS/binius.git", rev = "0e5ec53f260f40fe6afcc741d4ff8f021a66dc1a" }
binius_math = { git = "https://gitlab.com/IrreducibleOSS/binius.git", rev = "0e5ec53f260f40fe6afcc741d4ff8f021a66dc1a" }
blake3 = "1"
bytemuck = "1"
bumpalo = "3"
proptest = "1"
rayon = "1"
rustc-hash = "2"
1 change: 0 additions & 1 deletion Ix/Address.lean
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@

structure Address where
adr : ByteArray
2 changes: 2 additions & 0 deletions Ix/Blake3.lean
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
@[extern "lean_byte_array_blake3"]
opaque ByteArray.blake3 : @& ByteArray → ByteArray
12 changes: 12 additions & 0 deletions Ix/ByteArray.lean
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
namespace ByteArray

def beqNoFFI (a b : ByteArray) : Bool :=
a.data == b.data

@[extern "lean_byte_array_beq"]
def beq : @& ByteArray → @& ByteArray → Bool :=
beqNoFFI

instance : BEq ByteArray := ⟨ByteArray.beq⟩

end ByteArray
5 changes: 0 additions & 5 deletions Ix/Ixon.lean
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@

import Ix.Address
import Lean.Declaration
import Ix.Ixon.Serialize
import Ix.Ixon.Univ
import Ix.Ixon.Expr
import Ix.Ixon.Const




1 change: 0 additions & 1 deletion Ix/Ixon/Const.lean
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@

import Ix.Address
import Lean.Declaration
import Ix.Ixon.Serialize
Expand Down
7 changes: 3 additions & 4 deletions Ix/Ixon/Expr.lean
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@

import Ix.Address
import Lean.Declaration
import Ix.Ixon.Serialize
Expand All@@ -9,7 +8,7 @@ namespace Ixon
-- 0xTTTT_LXXX
inductive Expr where
-- 0x0, ^1
| vari (idx: UInt64) : Expr
| vari (idx: UInt64) : Expr
-- 0x1, {max (add 1 2) (var 1)}
| sort (univ: Univ) : Expr
-- 0x2 #dead_beef_cafe_babe {u1, u2, ... }
Expand All@@ -24,7 +23,7 @@ inductive Expr where
| alls (types: List Expr) (body: Expr) : Expr
-- 0x7 (let d : A in b)
| let_ (type: Expr) (defn: Expr) (body: Expr) : Expr
-- 0x8 .1
-- 0x8 .1
| proj : UInt64 -> Expr -> Expr
-- 0x9 "foobar"
| strl (lit: String) : Expr
Expand All@@ -33,7 +32,7 @@ inductive Expr where
-- array: 0xB
-- const: 0xC

def putExprTag (tag: UInt8) (val: UInt64) : PutM Unit :=
def putExprTag (tag: UInt8) (val: UInt64) : PutM Unit :=
let t := UInt8.shiftLeft tag 4
if val < 8
then putUInt8 (UInt8.lor t (Nat.toUInt8 (UInt64.toNat val))) *> pure ()
Expand Down
3 changes: 1 addition & 2 deletions Ix/Ixon/Serialize.lean
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@

namespace Ixon

class Serialize (A: Type) where
Expand All@@ -13,7 +12,7 @@ structure GetState where

abbrev GetM A := EStateM String GetState A

def runGet (getm: GetM A) (bytes: ByteArray) : Except String A :=
def runGet (getm: GetM A) (bytes: ByteArray) : Except String A :=
match EStateM.run getm { index := 0, bytes } with
| .ok a _ => .ok a
| .error e _ => .error e
Expand Down
4 changes: 3 additions & 1 deletion README.md
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
# ix
# ix

A verifiable computing platform
16 changes: 16 additions & 0 deletions Tests/Blake3.lean
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
import LSpec
import Ix.Blake3

def pairs : List $ (List UInt8 × List UInt8) := [
([0], [ 45, 58, 222, 223, 241, 27, 97, 241,
76, 136, 110, 53, 175, 160, 54, 115,
109, 205, 135, 167, 77, 39, 181, 193,
81, 2, 37, 208, 245, 146, 226, 19,])
]

open LSpec in
def main := lspecIO $
pairs.foldl (init := .done) fun tSeq (i, o) =>
let input := ByteArray.mk ⟨i⟩
let output := ByteArray.mk ⟨o⟩
tSeq ++ (test s!"blake3 on {input}" $ input.blake3.data = output.data)
22 changes: 22 additions & 0 deletions Tests/ByteArray.lean
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
import LSpec
import Ix.ByteArray

def arrays : List ByteArray := [
⟨#[]⟩, ⟨#[1]⟩, ⟨#[0, 3]⟩, ⟨#[1, 1, 1]⟩, ⟨#[3, 3, 3, 3]⟩, ⟨#[13]⟩
]

def arrays' : List ByteArray := [
⟨#[1]⟩, ⟨#[2]⟩, ⟨#[0, 3, 0]⟩, ⟨#[1, 2, 1]⟩, ⟨#[3, 3, 4, 3]⟩, ⟨#[13, 0]⟩
]

open LSpec

def beq : TestSeq :=
arrays.zip arrays |>.foldl (init := .done) fun tSeq (x, y) =>
tSeq ++ (test s!"{x} == {y}" $ x.beq y && x.beqNoFFI y && y.beq x && y.beqNoFFI x)

def neq : TestSeq :=
arrays.zip arrays.reverse |>.foldl (init := .done) fun tSeq (x, y) =>
tSeq ++ (test s!"{x} != {y}" $ !x.beq y && !x.beqNoFFI y && !y.beq x && !y.beqNoFFI x)

def main := lspecIO $ beq ++ neq
1 change: 1 addition & 0 deletions deny.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -92,6 +92,7 @@ allow = [
"MIT",
"Apache-2.0",
"Unicode-3.0",
"BSD-2-Clause",
"BSD-3-Clause",
"CC0-1.0",
"Zlib",
Expand Down
39 changes: 39 additions & 0 deletions ffi.c
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
#include <lean/lean.h>
#include <string.h>

#define intern inline static
#define l_arg b_lean_obj_arg
#define l_res lean_obj_res

// Interfaces targeting Rust implementations

void blake3(uint8_t*, size_t, uint8_t*);

// Auxiliary implementations

intern lean_sarray_object* mk_byte_array(size_t len) {
lean_sarray_object* o = (lean_sarray_object*)lean_alloc_object(
sizeof(lean_sarray_object) + len
);
lean_set_st_header((lean_object*)o, LeanScalarArray, 1);
o->m_size = len;
o->m_capacity = len;
return o;
}

// Implementations to serve Lean 4

extern l_res lean_byte_array_blake3(l_arg a) {
lean_sarray_object* oa = lean_to_sarray(a);
lean_sarray_object* res = mk_byte_array(32);
blake3(res->m_data, oa->m_size, oa->m_data);
return (lean_object*)res;
}

extern bool lean_byte_array_beq(l_arg a, l_arg b) {
lean_sarray_object* oa = lean_to_sarray(a);
lean_sarray_object* ob = lean_to_sarray(b);
size_t sa = oa->m_size;
if (sa == ob->m_size) return memcmp(oa->m_data, ob->m_data, sa) == 0;
return false;
}
12 changes: 11 additions & 1 deletion lake-manifest.json
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
{"version": "1.1.0",
"packagesDir": ".lake/packages",
"packages": [],
"packages":
[{"url": "https://github.com/argumentcomputer/LSpec",
"type": "git",
"subDir": null,
"scope": "",
"rev": "ca8e2803f89f0c12bf9743ae7abbfb2ea6b0eeec",
"name": "LSpec",
"manifestFile": "lake-manifest.json",
"inputRev": "ca8e2803f89f0c12bf9743ae7abbfb2ea6b0eeec",
"inherited": false,
"configFile": "lakefile.toml"}],
"name": "ix",
"lakeDir": ".lake"}
43 changes: 43 additions & 0 deletions lakefile.lean
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
import Lake
open System Lake DSL

package ix where
version := v!"0.1.0"

lean_lib Ix

@[default_target]
lean_exe ix where
root := `Main

require LSpec from git
"https://github.com/argumentcomputer/LSpec" @ "ca8e2803f89f0c12bf9743ae7abbfb2ea6b0eeec"

section Tests

lean_exe Tests.Blake3
lean_exe Tests.ByteArray

end Tests

section FFI

target ffi.o pkg : FilePath := do
let oFile := pkg.buildDir / "ffi.o"
let srcJob ← inputTextFile "ffi.c"
let includeDir ← getLeanIncludeDir
let weakArgs := #["-I", includeDir.toString]
buildO oFile srcJob weakArgs #["-fPIC"] "cc" getLeanTrace

extern_lib liblean_ffi pkg := do
let name := nameToStaticLib "ffi"
let ffiO ← ffi.o.fetch
buildStaticLib (pkg.nativeLibDir / name) #[ffiO]

extern_lib rust_ffi pkg := do
proc { cmd := "cargo", args := #["build", "--release"], cwd := pkg.dir }
let name := nameToStaticLib "ix"
let srcPath := pkg.dir / "target" / "release" / name
return pure srcPath

end FFI
10 changes: 0 additions & 10 deletions lakefile.toml

This file was deleted.

9 changes: 9 additions & 0 deletions src/lib.rs
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
pub mod eiur;

use blake3::hash;

#[no_mangle]
extern "C" fn blake3(mem: &mut [u8; 32], len: usize, input: *const u8) {
unsafe {
*mem = *hash(std::slice::from_raw_parts(input, len)).as_bytes();
}
}

#[cfg(test)]
mod tests {
#[test]
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 0 additions & 2 deletions .github/workflows/ci.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,5 @@ jobs:
# TODO: Add '.cargo/config' for list of enabled/disabled `xclippy`lints
- name: Check clippy warnings
run: cargo clippy -- -D warnings
- name: Doctests
run: cargo test --doc --workspace
- name: Cargo-deny
uses: EmbarkStudios/cargo-deny-action@v2
20 changes: 20 additions & 0 deletions .github/workflows/lspec.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
name: "LSpec CI"

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: It's a bit confusing to put the Lean build and test in separate files. I have no preference on splitting Lean and Rust tests into two files vs. combining them into one.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file is auto-generated by LSpec. I'd rather have an entirely separate file just for Lean 4 build and remove the Lean 4 job from ci.yml. At that point, we can rename it to rust_ci.yml

on:
pull_request:
push:
branches:
- main
jobs:
build:
name: Build
runs-on: ubuntu-latest
steps:
- name: install elan
run: |
set -o pipefail
curl -sSfL https://github.com/leanprover/elan/releases/download/v4.0.0/elan-x86_64-unknown-linux-gnu.tar.gz | tar xz

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The elan version will probably get out of date over time, so a workflow to auto-update would be useful. I can make an issue

./elan-init -y --default-toolchain none
echo "$HOME/.elan/bin" >> $GITHUB_PATH
- uses: actions/checkout@v4
- name: run LSpec binary
run: lake exe lspec
26 changes: 26 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,15 +3,19 @@ name = "ix"
version = "0.1.0"
edition = "2021"

[lib]
crate-type = ["staticlib"]

[dependencies]
anyhow = "1"
rustc-hash = "2"
binius_core = { git = "https://gitlab.com/IrreducibleOSS/binius.git", rev = "0e5ec53f260f40fe6afcc741d4ff8f021a66dc1a" }
binius_circuits = { git = "https://gitlab.com/IrreducibleOSS/binius.git", rev = "0e5ec53f260f40fe6afcc741d4ff8f021a66dc1a" }
binius_field = { git = "https://gitlab.com/IrreducibleOSS/binius.git", rev = "0e5ec53f260f40fe6afcc741d4ff8f021a66dc1a" }
binius_macros = { git = "https://gitlab.com/IrreducibleOSS/binius.git", rev = "0e5ec53f260f40fe6afcc741d4ff8f021a66dc1a" }
binius_math = { git = "https://gitlab.com/IrreducibleOSS/binius.git", rev = "0e5ec53f260f40fe6afcc741d4ff8f021a66dc1a" }
blake3 = "1"
bytemuck = "1"
bumpalo = "3"
proptest = "1"
rayon = "1"
rustc-hash = "2"
1 change: 0 additions & 1 deletion Ix/Address.lean
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@

structure Address where
adr : ByteArray
2 changes: 2 additions & 0 deletions Ix/Blake3.lean
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
@[extern "lean_byte_array_blake3"]
opaque ByteArray.blake3 : @& ByteArray → ByteArray
12 changes: 12 additions & 0 deletions Ix/ByteArray.lean
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
namespace ByteArray

def beqNoFFI (a b : ByteArray) : Bool :=
a.data == b.data

@[extern "lean_byte_array_beq"]
def beq : @& ByteArray → @& ByteArray → Bool :=
beqNoFFI

instance : BEq ByteArray := ⟨ByteArray.beq⟩

end ByteArray
5 changes: 0 additions & 5 deletions Ix/Ixon.lean
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@

import Ix.Address
import Lean.Declaration
import Ix.Ixon.Serialize
import Ix.Ixon.Univ
import Ix.Ixon.Expr
import Ix.Ixon.Const




1 change: 0 additions & 1 deletion Ix/Ixon/Const.lean
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@

import Ix.Address
import Lean.Declaration
import Ix.Ixon.Serialize
Expand Down
7 changes: 3 additions & 4 deletions Ix/Ixon/Expr.lean
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@

import Ix.Address
import Lean.Declaration
import Ix.Ixon.Serialize
Expand All@@ -9,7 +8,7 @@ namespace Ixon
-- 0xTTTT_LXXX
inductive Expr where
-- 0x0, ^1
| vari (idx: UInt64) : Expr
| vari (idx: UInt64) : Expr
-- 0x1, {max (add 1 2) (var 1)}
| sort (univ: Univ) : Expr
-- 0x2 #dead_beef_cafe_babe {u1, u2, ... }
Expand All@@ -24,7 +23,7 @@ inductive Expr where
| alls (types: List Expr) (body: Expr) : Expr
-- 0x7 (let d : A in b)
| let_ (type: Expr) (defn: Expr) (body: Expr) : Expr
-- 0x8 .1
-- 0x8 .1
| proj : UInt64 -> Expr -> Expr
-- 0x9 "foobar"
| strl (lit: String) : Expr
Expand All@@ -33,7 +32,7 @@ inductive Expr where
-- array: 0xB
-- const: 0xC

def putExprTag (tag: UInt8) (val: UInt64) : PutM Unit :=
def putExprTag (tag: UInt8) (val: UInt64) : PutM Unit :=
let t := UInt8.shiftLeft tag 4
if val < 8
then putUInt8 (UInt8.lor t (Nat.toUInt8 (UInt64.toNat val))) *> pure ()
Expand Down
3 changes: 1 addition & 2 deletions Ix/Ixon/Serialize.lean
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@

namespace Ixon

class Serialize (A: Type) where
Expand All@@ -13,7 +12,7 @@ structure GetState where

abbrev GetM A := EStateM String GetState A

def runGet (getm: GetM A) (bytes: ByteArray) : Except String A :=
def runGet (getm: GetM A) (bytes: ByteArray) : Except String A :=
match EStateM.run getm { index := 0, bytes } with
| .ok a _ => .ok a
| .error e _ => .error e
Expand Down
4 changes: 3 additions & 1 deletion README.md
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
# ix
# ix

A verifiable computing platform
16 changes: 16 additions & 0 deletions Tests/Blake3.lean
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
import LSpec
import Ix.Blake3

def pairs : List $ (List UInt8 × List UInt8) := [
([0], [ 45, 58, 222, 223, 241, 27, 97, 241,
76, 136, 110, 53, 175, 160, 54, 115,
109, 205, 135, 167, 77, 39, 181, 193,
81, 2, 37, 208, 245, 146, 226, 19,])
]

open LSpec in
def main := lspecIO $
pairs.foldl (init := .done) fun tSeq (i, o) =>
let input := ByteArray.mk ⟨i⟩
let output := ByteArray.mk ⟨o⟩
tSeq ++ (test s!"blake3 on {input}" $ input.blake3.data = output.data)
22 changes: 22 additions & 0 deletions Tests/ByteArray.lean
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
import LSpec
import Ix.ByteArray

def arrays : List ByteArray := [
⟨#[]⟩, ⟨#[1]⟩, ⟨#[0, 3]⟩, ⟨#[1, 1, 1]⟩, ⟨#[3, 3, 3, 3]⟩, ⟨#[13]⟩
]

def arrays' : List ByteArray := [
⟨#[1]⟩, ⟨#[2]⟩, ⟨#[0, 3, 0]⟩, ⟨#[1, 2, 1]⟩, ⟨#[3, 3, 4, 3]⟩, ⟨#[13, 0]⟩
]

open LSpec

def beq : TestSeq :=
arrays.zip arrays |>.foldl (init := .done) fun tSeq (x, y) =>
tSeq ++ (test s!"{x} == {y}" $ x.beq y && x.beqNoFFI y && y.beq x && y.beqNoFFI x)

def neq : TestSeq :=
arrays.zip arrays.reverse |>.foldl (init := .done) fun tSeq (x, y) =>
tSeq ++ (test s!"{x} != {y}" $ !x.beq y && !x.beqNoFFI y && !y.beq x && !y.beqNoFFI x)

def main := lspecIO $ beq ++ neq
1 change: 1 addition & 0 deletions deny.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -92,6 +92,7 @@ allow = [
"MIT",
"Apache-2.0",
"Unicode-3.0",
"BSD-2-Clause",
"BSD-3-Clause",
"CC0-1.0",
"Zlib",
Expand Down
39 changes: 39 additions & 0 deletions ffi.c
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
#include <lean/lean.h>
#include <string.h>

#define intern inline static
#define l_arg b_lean_obj_arg
#define l_res lean_obj_res

// Interfaces targeting Rust implementations

void blake3(uint8_t*, size_t, uint8_t*);

// Auxiliary implementations

intern lean_sarray_object* mk_byte_array(size_t len) {
lean_sarray_object* o = (lean_sarray_object*)lean_alloc_object(
sizeof(lean_sarray_object) + len
);
lean_set_st_header((lean_object*)o, LeanScalarArray, 1);
o->m_size = len;
o->m_capacity = len;
return o;
}

// Implementations to serve Lean 4

extern l_res lean_byte_array_blake3(l_arg a) {
lean_sarray_object* oa = lean_to_sarray(a);
lean_sarray_object* res = mk_byte_array(32);
blake3(res->m_data, oa->m_size, oa->m_data);
return (lean_object*)res;
}

extern bool lean_byte_array_beq(l_arg a, l_arg b) {
lean_sarray_object* oa = lean_to_sarray(a);
lean_sarray_object* ob = lean_to_sarray(b);
size_t sa = oa->m_size;
if (sa == ob->m_size) return memcmp(oa->m_data, ob->m_data, sa) == 0;
return false;
}
12 changes: 11 additions & 1 deletion lake-manifest.json
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
{"version": "1.1.0",
"packagesDir": ".lake/packages",
"packages": [],
"packages":
[{"url": "https://github.com/argumentcomputer/LSpec",
"type": "git",
"subDir": null,
"scope": "",
"rev": "ca8e2803f89f0c12bf9743ae7abbfb2ea6b0eeec",
"name": "LSpec",
"manifestFile": "lake-manifest.json",
"inputRev": "ca8e2803f89f0c12bf9743ae7abbfb2ea6b0eeec",
"inherited": false,
"configFile": "lakefile.toml"}],
"name": "ix",
"lakeDir": ".lake"}
43 changes: 43 additions & 0 deletions lakefile.lean
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
import Lake
open System Lake DSL

package ix where
version := v!"0.1.0"

lean_lib Ix

@[default_target]
lean_exe ix where
root := `Main

require LSpec from git
"https://github.com/argumentcomputer/LSpec" @ "ca8e2803f89f0c12bf9743ae7abbfb2ea6b0eeec"

section Tests

lean_exe Tests.Blake3
lean_exe Tests.ByteArray

end Tests

section FFI

target ffi.o pkg : FilePath := do
let oFile := pkg.buildDir / "ffi.o"
let srcJob ← inputTextFile "ffi.c"
let includeDir ← getLeanIncludeDir
let weakArgs := #["-I", includeDir.toString]
buildO oFile srcJob weakArgs #["-fPIC"] "cc" getLeanTrace

extern_lib liblean_ffi pkg := do
let name := nameToStaticLib "ffi"
let ffiO ← ffi.o.fetch
buildStaticLib (pkg.nativeLibDir / name) #[ffiO]

extern_lib rust_ffi pkg := do
proc { cmd := "cargo", args := #["build", "--release"], cwd := pkg.dir }
let name := nameToStaticLib "ix"
let srcPath := pkg.dir / "target" / "release" / name
return pure srcPath

end FFI
10 changes: 0 additions & 10 deletions lakefile.toml

This file was deleted.

9 changes: 9 additions & 0 deletions src/lib.rs
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
pub mod eiur;

use blake3::hash;

#[no_mangle]
extern "C" fn blake3(mem: &mut [u8; 32], len: usize, input: *const u8) {
unsafe {
*mem = *hash(std::slice::from_raw_parts(input, len)).as_bytes();
}
}

#[cfg(test)]
mod tests {
#[test]
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 0 additions & 2 deletions .github/workflows/ci.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,5 @@ jobs:
# TODO: Add '.cargo/config' for list of enabled/disabled `xclippy`lints
- name: Check clippy warnings
run: cargo clippy -- -D warnings
- name: Doctests
run: cargo test --doc --workspace
- name: Cargo-deny
uses: EmbarkStudios/cargo-deny-action@v2
20 changes: 20 additions & 0 deletions .github/workflows/lspec.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
name: "LSpec CI"

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: It's a bit confusing to put the Lean build and test in separate files. I have no preference on splitting Lean and Rust tests into two files vs. combining them into one.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file is auto-generated by LSpec. I'd rather have an entirely separate file just for Lean 4 build and remove the Lean 4 job from ci.yml. At that point, we can rename it to rust_ci.yml

on:
pull_request:
push:
branches:
- main
jobs:
build:
name: Build
runs-on: ubuntu-latest
steps:
- name: install elan
run: |
set -o pipefail
curl -sSfL https://github.com/leanprover/elan/releases/download/v4.0.0/elan-x86_64-unknown-linux-gnu.tar.gz | tar xz

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The elan version will probably get out of date over time, so a workflow to auto-update would be useful. I can make an issue

./elan-init -y --default-toolchain none
echo "$HOME/.elan/bin" >> $GITHUB_PATH
- uses: actions/checkout@v4
- name: run LSpec binary
run: lake exe lspec
26 changes: 26 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,15 +3,19 @@ name = "ix"
version = "0.1.0"
edition = "2021"

[lib]
crate-type = ["staticlib"]

[dependencies]
anyhow = "1"
rustc-hash = "2"
binius_core = { git = "https://gitlab.com/IrreducibleOSS/binius.git", rev = "0e5ec53f260f40fe6afcc741d4ff8f021a66dc1a" }
binius_circuits = { git = "https://gitlab.com/IrreducibleOSS/binius.git", rev = "0e5ec53f260f40fe6afcc741d4ff8f021a66dc1a" }
binius_field = { git = "https://gitlab.com/IrreducibleOSS/binius.git", rev = "0e5ec53f260f40fe6afcc741d4ff8f021a66dc1a" }
binius_macros = { git = "https://gitlab.com/IrreducibleOSS/binius.git", rev = "0e5ec53f260f40fe6afcc741d4ff8f021a66dc1a" }
binius_math = { git = "https://gitlab.com/IrreducibleOSS/binius.git", rev = "0e5ec53f260f40fe6afcc741d4ff8f021a66dc1a" }
blake3 = "1"
bytemuck = "1"
bumpalo = "3"
proptest = "1"
rayon = "1"
rustc-hash = "2"
1 change: 0 additions & 1 deletion Ix/Address.lean
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@

structure Address where
adr : ByteArray
2 changes: 2 additions & 0 deletions Ix/Blake3.lean
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
@[extern "lean_byte_array_blake3"]
opaque ByteArray.blake3 : @& ByteArray → ByteArray
12 changes: 12 additions & 0 deletions Ix/ByteArray.lean
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
namespace ByteArray

def beqNoFFI (a b : ByteArray) : Bool :=
a.data == b.data

@[extern "lean_byte_array_beq"]
def beq : @& ByteArray → @& ByteArray → Bool :=
beqNoFFI

instance : BEq ByteArray := ⟨ByteArray.beq⟩

end ByteArray
5 changes: 0 additions & 5 deletions Ix/Ixon.lean
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@

import Ix.Address
import Lean.Declaration
import Ix.Ixon.Serialize
import Ix.Ixon.Univ
import Ix.Ixon.Expr
import Ix.Ixon.Const




1 change: 0 additions & 1 deletion Ix/Ixon/Const.lean
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@

import Ix.Address
import Lean.Declaration
import Ix.Ixon.Serialize
Expand Down
7 changes: 3 additions & 4 deletions Ix/Ixon/Expr.lean
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@

import Ix.Address
import Lean.Declaration
import Ix.Ixon.Serialize
Expand All@@ -9,7 +8,7 @@ namespace Ixon
-- 0xTTTT_LXXX
inductive Expr where
-- 0x0, ^1
| vari (idx: UInt64) : Expr
| vari (idx: UInt64) : Expr
-- 0x1, {max (add 1 2) (var 1)}
| sort (univ: Univ) : Expr
-- 0x2 #dead_beef_cafe_babe {u1, u2, ... }
Expand All@@ -24,7 +23,7 @@ inductive Expr where
| alls (types: List Expr) (body: Expr) : Expr
-- 0x7 (let d : A in b)
| let_ (type: Expr) (defn: Expr) (body: Expr) : Expr
-- 0x8 .1
-- 0x8 .1
| proj : UInt64 -> Expr -> Expr
-- 0x9 "foobar"
| strl (lit: String) : Expr
Expand All@@ -33,7 +32,7 @@ inductive Expr where
-- array: 0xB
-- const: 0xC

def putExprTag (tag: UInt8) (val: UInt64) : PutM Unit :=
def putExprTag (tag: UInt8) (val: UInt64) : PutM Unit :=
let t := UInt8.shiftLeft tag 4
if val < 8
then putUInt8 (UInt8.lor t (Nat.toUInt8 (UInt64.toNat val))) *> pure ()
Expand Down
3 changes: 1 addition & 2 deletions Ix/Ixon/Serialize.lean
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@

namespace Ixon

class Serialize (A: Type) where
Expand All@@ -13,7 +12,7 @@ structure GetState where

abbrev GetM A := EStateM String GetState A

def runGet (getm: GetM A) (bytes: ByteArray) : Except String A :=
def runGet (getm: GetM A) (bytes: ByteArray) : Except String A :=
match EStateM.run getm { index := 0, bytes } with
| .ok a _ => .ok a
| .error e _ => .error e
Expand Down
4 changes: 3 additions & 1 deletion README.md
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
# ix
# ix

A verifiable computing platform
16 changes: 16 additions & 0 deletions Tests/Blake3.lean
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
import LSpec
import Ix.Blake3

def pairs : List $ (List UInt8 × List UInt8) := [
([0], [ 45, 58, 222, 223, 241, 27, 97, 241,
76, 136, 110, 53, 175, 160, 54, 115,
109, 205, 135, 167, 77, 39, 181, 193,
81, 2, 37, 208, 245, 146, 226, 19,])
]

open LSpec in
def main := lspecIO $
pairs.foldl (init := .done) fun tSeq (i, o) =>
let input := ByteArray.mk ⟨i⟩
let output := ByteArray.mk ⟨o⟩
tSeq ++ (test s!"blake3 on {input}" $ input.blake3.data = output.data)
22 changes: 22 additions & 0 deletions Tests/ByteArray.lean
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
import LSpec
import Ix.ByteArray

def arrays : List ByteArray := [
⟨#[]⟩, ⟨#[1]⟩, ⟨#[0, 3]⟩, ⟨#[1, 1, 1]⟩, ⟨#[3, 3, 3, 3]⟩, ⟨#[13]⟩
]

def arrays' : List ByteArray := [
⟨#[1]⟩, ⟨#[2]⟩, ⟨#[0, 3, 0]⟩, ⟨#[1, 2, 1]⟩, ⟨#[3, 3, 4, 3]⟩, ⟨#[13, 0]⟩
]

open LSpec

def beq : TestSeq :=
arrays.zip arrays |>.foldl (init := .done) fun tSeq (x, y) =>
tSeq ++ (test s!"{x} == {y}" $ x.beq y && x.beqNoFFI y && y.beq x && y.beqNoFFI x)

def neq : TestSeq :=
arrays.zip arrays.reverse |>.foldl (init := .done) fun tSeq (x, y) =>
tSeq ++ (test s!"{x} != {y}" $ !x.beq y && !x.beqNoFFI y && !y.beq x && !y.beqNoFFI x)

def main := lspecIO $ beq ++ neq
1 change: 1 addition & 0 deletions deny.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -92,6 +92,7 @@ allow = [
"MIT",
"Apache-2.0",
"Unicode-3.0",
"BSD-2-Clause",
"BSD-3-Clause",
"CC0-1.0",
"Zlib",
Expand Down
39 changes: 39 additions & 0 deletions ffi.c
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
#include <lean/lean.h>
#include <string.h>

#define intern inline static
#define l_arg b_lean_obj_arg
#define l_res lean_obj_res

// Interfaces targeting Rust implementations

void blake3(uint8_t*, size_t, uint8_t*);

// Auxiliary implementations

intern lean_sarray_object* mk_byte_array(size_t len) {
lean_sarray_object* o = (lean_sarray_object*)lean_alloc_object(
sizeof(lean_sarray_object) + len
);
lean_set_st_header((lean_object*)o, LeanScalarArray, 1);
o->m_size = len;
o->m_capacity = len;
return o;
}

// Implementations to serve Lean 4

extern l_res lean_byte_array_blake3(l_arg a) {
lean_sarray_object* oa = lean_to_sarray(a);
lean_sarray_object* res = mk_byte_array(32);
blake3(res->m_data, oa->m_size, oa->m_data);
return (lean_object*)res;
}

extern bool lean_byte_array_beq(l_arg a, l_arg b) {
lean_sarray_object* oa = lean_to_sarray(a);
lean_sarray_object* ob = lean_to_sarray(b);
size_t sa = oa->m_size;
if (sa == ob->m_size) return memcmp(oa->m_data, ob->m_data, sa) == 0;
return false;
}
12 changes: 11 additions & 1 deletion lake-manifest.json
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
{"version": "1.1.0",
"packagesDir": ".lake/packages",
"packages": [],
"packages":
[{"url": "https://github.com/argumentcomputer/LSpec",
"type": "git",
"subDir": null,
"scope": "",
"rev": "ca8e2803f89f0c12bf9743ae7abbfb2ea6b0eeec",
"name": "LSpec",
"manifestFile": "lake-manifest.json",
"inputRev": "ca8e2803f89f0c12bf9743ae7abbfb2ea6b0eeec",
"inherited": false,
"configFile": "lakefile.toml"}],
"name": "ix",
"lakeDir": ".lake"}
43 changes: 43 additions & 0 deletions lakefile.lean
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
import Lake
open System Lake DSL

package ix where
version := v!"0.1.0"

lean_lib Ix

@[default_target]
lean_exe ix where
root := `Main

require LSpec from git
"https://github.com/argumentcomputer/LSpec" @ "ca8e2803f89f0c12bf9743ae7abbfb2ea6b0eeec"

section Tests

lean_exe Tests.Blake3
lean_exe Tests.ByteArray

end Tests

section FFI

target ffi.o pkg : FilePath := do
let oFile := pkg.buildDir / "ffi.o"
let srcJob ← inputTextFile "ffi.c"
let includeDir ← getLeanIncludeDir
let weakArgs := #["-I", includeDir.toString]
buildO oFile srcJob weakArgs #["-fPIC"] "cc" getLeanTrace

extern_lib liblean_ffi pkg := do
let name := nameToStaticLib "ffi"
let ffiO ← ffi.o.fetch
buildStaticLib (pkg.nativeLibDir / name) #[ffiO]

extern_lib rust_ffi pkg := do
proc { cmd := "cargo", args := #["build", "--release"], cwd := pkg.dir }
let name := nameToStaticLib "ix"
let srcPath := pkg.dir / "target" / "release" / name
return pure srcPath

end FFI
10 changes: 0 additions & 10 deletions lakefile.toml

This file was deleted.

9 changes: 9 additions & 0 deletions src/lib.rs
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
pub mod eiur;

use blake3::hash;

#[no_mangle]
extern "C" fn blake3(mem: &mut [u8; 32], len: usize, input: *const u8) {
unsafe {
*mem = *hash(std::slice::from_raw_parts(input, len)).as_bytes();
}
}

#[cfg(test)]
mod tests {
#[test]
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 0 additions & 2 deletions .github/workflows/ci.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,5 @@ jobs:
# TODO: Add '.cargo/config' for list of enabled/disabled `xclippy`lints
- name: Check clippy warnings
run: cargo clippy -- -D warnings
- name: Doctests
run: cargo test --doc --workspace
- name: Cargo-deny
uses: EmbarkStudios/cargo-deny-action@v2
20 changes: 20 additions & 0 deletions .github/workflows/lspec.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
name: "LSpec CI"

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: It's a bit confusing to put the Lean build and test in separate files. I have no preference on splitting Lean and Rust tests into two files vs. combining them into one.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file is auto-generated by LSpec. I'd rather have an entirely separate file just for Lean 4 build and remove the Lean 4 job from ci.yml. At that point, we can rename it to rust_ci.yml

on:
pull_request:
push:
branches:
- main
jobs:
build:
name: Build
runs-on: ubuntu-latest
steps:
- name: install elan
run: |
set -o pipefail
curl -sSfL https://github.com/leanprover/elan/releases/download/v4.0.0/elan-x86_64-unknown-linux-gnu.tar.gz | tar xz

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The elan version will probably get out of date over time, so a workflow to auto-update would be useful. I can make an issue

./elan-init -y --default-toolchain none
echo "$HOME/.elan/bin" >> $GITHUB_PATH
- uses: actions/checkout@v4
- name: run LSpec binary
run: lake exe lspec
26 changes: 26 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,15 +3,19 @@ name = "ix"
version = "0.1.0"
edition = "2021"

[lib]
crate-type = ["staticlib"]

[dependencies]
anyhow = "1"
rustc-hash = "2"
binius_core = { git = "https://gitlab.com/IrreducibleOSS/binius.git", rev = "0e5ec53f260f40fe6afcc741d4ff8f021a66dc1a" }
binius_circuits = { git = "https://gitlab.com/IrreducibleOSS/binius.git", rev = "0e5ec53f260f40fe6afcc741d4ff8f021a66dc1a" }
binius_field = { git = "https://gitlab.com/IrreducibleOSS/binius.git", rev = "0e5ec53f260f40fe6afcc741d4ff8f021a66dc1a" }
binius_macros = { git = "https://gitlab.com/IrreducibleOSS/binius.git", rev = "0e5ec53f260f40fe6afcc741d4ff8f021a66dc1a" }
binius_math = { git = "https://gitlab.com/IrreducibleOSS/binius.git", rev = "0e5ec53f260f40fe6afcc741d4ff8f021a66dc1a" }
blake3 = "1"
bytemuck = "1"
bumpalo = "3"
proptest = "1"
rayon = "1"
rustc-hash = "2"
1 change: 0 additions & 1 deletion Ix/Address.lean
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@

structure Address where
adr : ByteArray
2 changes: 2 additions & 0 deletions Ix/Blake3.lean
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
@[extern "lean_byte_array_blake3"]
opaque ByteArray.blake3 : @& ByteArray → ByteArray
12 changes: 12 additions & 0 deletions Ix/ByteArray.lean
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
namespace ByteArray

def beqNoFFI (a b : ByteArray) : Bool :=
a.data == b.data

@[extern "lean_byte_array_beq"]
def beq : @& ByteArray → @& ByteArray → Bool :=
beqNoFFI

instance : BEq ByteArray := ⟨ByteArray.beq⟩

end ByteArray
5 changes: 0 additions & 5 deletions Ix/Ixon.lean
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@

import Ix.Address
import Lean.Declaration
import Ix.Ixon.Serialize
import Ix.Ixon.Univ
import Ix.Ixon.Expr
import Ix.Ixon.Const




1 change: 0 additions & 1 deletion Ix/Ixon/Const.lean
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@

import Ix.Address
import Lean.Declaration
import Ix.Ixon.Serialize
Expand Down
7 changes: 3 additions & 4 deletions Ix/Ixon/Expr.lean
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@

import Ix.Address
import Lean.Declaration
import Ix.Ixon.Serialize
Expand All@@ -9,7 +8,7 @@ namespace Ixon
-- 0xTTTT_LXXX
inductive Expr where
-- 0x0, ^1
| vari (idx: UInt64) : Expr
| vari (idx: UInt64) : Expr
-- 0x1, {max (add 1 2) (var 1)}
| sort (univ: Univ) : Expr
-- 0x2 #dead_beef_cafe_babe {u1, u2, ... }
Expand All@@ -24,7 +23,7 @@ inductive Expr where
| alls (types: List Expr) (body: Expr) : Expr
-- 0x7 (let d : A in b)
| let_ (type: Expr) (defn: Expr) (body: Expr) : Expr
-- 0x8 .1
-- 0x8 .1
| proj : UInt64 -> Expr -> Expr
-- 0x9 "foobar"
| strl (lit: String) : Expr
Expand All@@ -33,7 +32,7 @@ inductive Expr where
-- array: 0xB
-- const: 0xC

def putExprTag (tag: UInt8) (val: UInt64) : PutM Unit :=
def putExprTag (tag: UInt8) (val: UInt64) : PutM Unit :=
let t := UInt8.shiftLeft tag 4
if val < 8
then putUInt8 (UInt8.lor t (Nat.toUInt8 (UInt64.toNat val))) *> pure ()
Expand Down
3 changes: 1 addition & 2 deletions Ix/Ixon/Serialize.lean
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@

namespace Ixon

class Serialize (A: Type) where
Expand All@@ -13,7 +12,7 @@ structure GetState where

abbrev GetM A := EStateM String GetState A

def runGet (getm: GetM A) (bytes: ByteArray) : Except String A :=
def runGet (getm: GetM A) (bytes: ByteArray) : Except String A :=
match EStateM.run getm { index := 0, bytes } with
| .ok a _ => .ok a
| .error e _ => .error e
Expand Down
4 changes: 3 additions & 1 deletion README.md
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
# ix
# ix

A verifiable computing platform
16 changes: 16 additions & 0 deletions Tests/Blake3.lean
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
import LSpec
import Ix.Blake3

def pairs : List $ (List UInt8 × List UInt8) := [
([0], [ 45, 58, 222, 223, 241, 27, 97, 241,
76, 136, 110, 53, 175, 160, 54, 115,
109, 205, 135, 167, 77, 39, 181, 193,
81, 2, 37, 208, 245, 146, 226, 19,])
]

open LSpec in
def main := lspecIO $
pairs.foldl (init := .done) fun tSeq (i, o) =>
let input := ByteArray.mk ⟨i⟩
let output := ByteArray.mk ⟨o⟩
tSeq ++ (test s!"blake3 on {input}" $ input.blake3.data = output.data)
22 changes: 22 additions & 0 deletions Tests/ByteArray.lean
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
import LSpec
import Ix.ByteArray

def arrays : List ByteArray := [
⟨#[]⟩, ⟨#[1]⟩, ⟨#[0, 3]⟩, ⟨#[1, 1, 1]⟩, ⟨#[3, 3, 3, 3]⟩, ⟨#[13]⟩
]

def arrays' : List ByteArray := [
⟨#[1]⟩, ⟨#[2]⟩, ⟨#[0, 3, 0]⟩, ⟨#[1, 2, 1]⟩, ⟨#[3, 3, 4, 3]⟩, ⟨#[13, 0]⟩
]

open LSpec

def beq : TestSeq :=
arrays.zip arrays |>.foldl (init := .done) fun tSeq (x, y) =>
tSeq ++ (test s!"{x} == {y}" $ x.beq y && x.beqNoFFI y && y.beq x && y.beqNoFFI x)

def neq : TestSeq :=
arrays.zip arrays.reverse |>.foldl (init := .done) fun tSeq (x, y) =>
tSeq ++ (test s!"{x} != {y}" $ !x.beq y && !x.beqNoFFI y && !y.beq x && !y.beqNoFFI x)

def main := lspecIO $ beq ++ neq
1 change: 1 addition & 0 deletions deny.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -92,6 +92,7 @@ allow = [
"MIT",
"Apache-2.0",
"Unicode-3.0",
"BSD-2-Clause",
"BSD-3-Clause",
"CC0-1.0",
"Zlib",
Expand Down
39 changes: 39 additions & 0 deletions ffi.c
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
#include <lean/lean.h>
#include <string.h>

#define intern inline static
#define l_arg b_lean_obj_arg
#define l_res lean_obj_res

// Interfaces targeting Rust implementations

void blake3(uint8_t*, size_t, uint8_t*);

// Auxiliary implementations

intern lean_sarray_object* mk_byte_array(size_t len) {
lean_sarray_object* o = (lean_sarray_object*)lean_alloc_object(
sizeof(lean_sarray_object) + len
);
lean_set_st_header((lean_object*)o, LeanScalarArray, 1);
o->m_size = len;
o->m_capacity = len;
return o;
}

// Implementations to serve Lean 4

extern l_res lean_byte_array_blake3(l_arg a) {
lean_sarray_object* oa = lean_to_sarray(a);
lean_sarray_object* res = mk_byte_array(32);
blake3(res->m_data, oa->m_size, oa->m_data);
return (lean_object*)res;
}

extern bool lean_byte_array_beq(l_arg a, l_arg b) {
lean_sarray_object* oa = lean_to_sarray(a);
lean_sarray_object* ob = lean_to_sarray(b);
size_t sa = oa->m_size;
if (sa == ob->m_size) return memcmp(oa->m_data, ob->m_data, sa) == 0;
return false;
}
12 changes: 11 additions & 1 deletion lake-manifest.json
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
{"version": "1.1.0",
"packagesDir": ".lake/packages",
"packages": [],
"packages":
[{"url": "https://github.com/argumentcomputer/LSpec",
"type": "git",
"subDir": null,
"scope": "",
"rev": "ca8e2803f89f0c12bf9743ae7abbfb2ea6b0eeec",
"name": "LSpec",
"manifestFile": "lake-manifest.json",
"inputRev": "ca8e2803f89f0c12bf9743ae7abbfb2ea6b0eeec",
"inherited": false,
"configFile": "lakefile.toml"}],
"name": "ix",
"lakeDir": ".lake"}
43 changes: 43 additions & 0 deletions lakefile.lean
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
import Lake
open System Lake DSL

package ix where
version := v!"0.1.0"

lean_lib Ix

@[default_target]
lean_exe ix where
root := `Main

require LSpec from git
"https://github.com/argumentcomputer/LSpec" @ "ca8e2803f89f0c12bf9743ae7abbfb2ea6b0eeec"

section Tests

lean_exe Tests.Blake3
lean_exe Tests.ByteArray

end Tests

section FFI

target ffi.o pkg : FilePath := do
let oFile := pkg.buildDir / "ffi.o"
let srcJob ← inputTextFile "ffi.c"
let includeDir ← getLeanIncludeDir
let weakArgs := #["-I", includeDir.toString]
buildO oFile srcJob weakArgs #["-fPIC"] "cc" getLeanTrace

extern_lib liblean_ffi pkg := do
let name := nameToStaticLib "ffi"
let ffiO ← ffi.o.fetch
buildStaticLib (pkg.nativeLibDir / name) #[ffiO]

extern_lib rust_ffi pkg := do
proc { cmd := "cargo", args := #["build", "--release"], cwd := pkg.dir }
let name := nameToStaticLib "ix"
let srcPath := pkg.dir / "target" / "release" / name
return pure srcPath

end FFI
10 changes: 0 additions & 10 deletions lakefile.toml

This file was deleted.

9 changes: 9 additions & 0 deletions src/lib.rs
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
pub mod eiur;

use blake3::hash;

#[no_mangle]
extern "C" fn blake3(mem: &mut [u8; 32], len: usize, input: *const u8) {
unsafe {
*mem = *hash(std::slice::from_raw_parts(input, len)).as_bytes();
}
}

#[cfg(test)]
mod tests {
#[test]
Expand Down