Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

chore: Rename to argument #1261

Merged
merged 5 commits into from
Sep 25, 2024
Merged
Show file tree
Hide file tree
Changes from 4 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
22 changes: 11 additions & 11 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
# Global Owners: @porcuquine, @huitseeker
* @lurk-lab/lurk-noncircuit
* @argumentcomputer/lurk-noncircuit

# CI maintenance
/.circleci/** @lurk-lab/lurk-ci
/.config/** @lurk-lab/lurk-ci
/.github/** @lurk-lab/lurk-ci
/.circleci/** @argumentcomputer/lurk-ci
/.config/** @argumentcomputer/lurk-ci
/.github/** @argumentcomputer/lurk-ci

# Benchmarks
/benches/** @lurk-lab/lurk-benches
/benches/** @argumentcomputer/lurk-benches

# CLI tools
/src/cli/** @lurk-lab/lurk-cli-tools
/src/cli/** @argumentcomputer/lurk-cli-tools

# Circuit
/src/circuit/** @lurk-lab/lurk-circuit
/src/lem/circuit.rs @lurk-lab/lurk-circuit
/src/coprocessor/** @lurk-lab/lurk-circuit
/src/coroutine/** @lurk-lab/lurk-circuit
/src/circuit/** @argumentcomputer/lurk-circuit
/src/lem/circuit.rs @argumentcomputer/lurk-circuit
/src/coprocessor/** @argumentcomputer/lurk-circuit
/src/coroutine/** @argumentcomputer/lurk-circuit

# Evaluation model
/src/lem/eval.rs @lurk-lab/lurk-lem
/src/lem/eval.rs @argumentcomputer/lurk-lem
2 changes: 1 addition & 1 deletion .github/workflows/bench-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
# Install deps
- uses: actions/checkout@v4
with:
repository: lurk-lab/ci-workflows
repository: argumentcomputer/ci-workflows
- uses: ./.github/actions/gpu-setup
with:
gpu-framework: 'cuda'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/bench-pr-comment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
&& github.event.issue.state == 'open'
&& (contains(github.event.comment.body, '!benchmark') || contains(github.event.comment.body, '!gpu-benchmark'))
&& (github.event.comment.author_association == 'MEMBER' || github.event.comment.author_association == 'OWNER')
uses: lurk-lab/ci-workflows/.github/workflows/bench-pr-comment.yml@main
uses: argumentcomputer/ci-workflows/.github/workflows/bench-pr-comment.yml@main
with:
default-runner: "self-hosted,gpu-bench"
default-benches: "fibonacci"
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ concurrency:

jobs:
linux:
runs-on: buildjet-16vcpu-ubuntu-2204
runs-on: warp-ubuntu-2404-x64-16x
steps:
- uses: actions/checkout@v4
with:
repository: lurk-lab/ci-workflows
repository: argumentcomputer/ci-workflows
- uses: ./.github/actions/ci-env
- uses: ./.github/actions/install-deps
with:
Expand All @@ -37,26 +37,26 @@ jobs:

# Rustfmt, clippy, doctests
code-quality:
uses: lurk-lab/ci-workflows/.github/workflows/lints.yml@main
uses: argumentcomputer/ci-workflows/.github/workflows/lints.yml@main
with:
packages: 'protobuf-compiler libprotobuf-dev'

# Checks `cargo build --target wasm32-unknown-unknown`
wasm:
uses: lurk-lab/ci-workflows/.github/workflows/wasm.yml@main
uses: argumentcomputer/ci-workflows/.github/workflows/wasm.yml@main

# Checks MSRV specified by `rust-version` in `Cargo.toml`
msrv:
uses: lurk-lab/ci-workflows/.github/workflows/msrv.yml@main
uses: argumentcomputer/ci-workflows/.github/workflows/msrv.yml@main
with:
packages: 'protobuf-compiler libprotobuf-dev'

# Check documentation links aren't broken
link-checker:
uses: lurk-lab/ci-workflows/.github/workflows/links-check.yml@main
uses: argumentcomputer/ci-workflows/.github/workflows/links-check.yml@main
with:
fail-fast: true

# Lint dependencies for licensing and auditing issues as per https://github.com/lurk-lab/lurk-rs/blob/main/deny.toml
# Lint dependencies for licensing and auditing issues as per https://github.com/argumentcomputer/lurk-beta/blob/main/deny.toml
licenses-audits:
uses: lurk-lab/ci-workflows/.github/workflows/licenses-audits.yml@main
uses: argumentcomputer/ci-workflows/.github/workflows/licenses-audits.yml@main
2 changes: 1 addition & 1 deletion .github/workflows/codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ on:

jobs:
codecov-grcov:
uses: lurk-lab/ci-workflows/.github/workflows/codecov.yml@main
uses: argumentcomputer/ci-workflows/.github/workflows/codecov.yml@main
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ on:

jobs:
docs:
uses: lurk-lab/ci-workflows/.github/workflows/docs.yml@main
uses: argumentcomputer/ci-workflows/.github/workflows/docs.yml@main
2 changes: 1 addition & 1 deletion .github/workflows/gpu-bench-manual-comparative.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
steps:
- uses: actions/checkout@v4
with:
repository: lurk-lab/ci-workflows
repository: argumentcomputer/ci-workflows
- uses: ./.github/actions/gpu-setup
with:
gpu-framework: 'cuda'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gpu-bench-merge-regression.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
steps:
- uses: actions/checkout@v4
with:
repository: lurk-lab/ci-workflows
repository: argumentcomputer/ci-workflows
- uses: ./.github/actions/gpu-setup
with:
gpu-framework: 'cuda'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gpu-bench-workflow-dispatch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
steps:
- uses: actions/checkout@v4
with:
repository: lurk-lab/ci-workflows
repository: argumentcomputer/ci-workflows
- uses: ./.github/actions/gpu-setup
with:
gpu-framework: 'cuda'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gpu-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ concurrency:
jobs:
gpu-ci:
name: Rust GPU tests
uses: lurk-lab/ci-workflows/.github/workflows/gpu-ci-cuda.yml@main
uses: argumentcomputer/ci-workflows/.github/workflows/gpu-ci-cuda.yml@main
6 changes: 3 additions & 3 deletions .github/workflows/merge-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
steps:
- uses: actions/checkout@v4
with:
repository: lurk-lab/ci-workflows
repository: argumentcomputer/ci-workflows
- uses: ./.github/actions/install-deps
with:
packages: 'pkg-config libssl-dev protobuf-compiler libprotobuf-dev'
Expand All @@ -42,7 +42,7 @@ jobs:
steps:
- uses: actions/checkout@v4
with:
repository: lurk-lab/ci-workflows
repository: argumentcomputer/ci-workflows
- uses: ./.github/actions/install-deps
with:
packages: 'pkg-config libssl-dev protobuf-compiler libprotobuf-dev'
Expand All @@ -65,7 +65,7 @@ jobs:
steps:
- uses: actions/checkout@v4
with:
repository: lurk-lab/ci-workflows
repository: argumentcomputer/ci-workflows
- name: Install dependencies
run: |
brew install protobuf
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
steps:
- uses: actions/checkout@v4
with:
repository: lurk-lab/ci-workflows
repository: argumentcomputer/ci-workflows
- uses: ./.github/actions/ci-env
- uses: actions/checkout@v4
with:
Expand Down Expand Up @@ -52,15 +52,15 @@ jobs:

- name: Amend MESSAGE for tests
if: steps.tests.outcome != 'success'
run: echo "MESSAGE=${{ env.MESSAGE }} Exhaustive test run failed in https://github.com/lurk-lab/lurk-rs/actions/runs/${{ github.run_id }}" >> $GITHUB_ENV
run: echo "MESSAGE=${{ env.MESSAGE }} Exhaustive test run failed in https://github.com/argumentcomputer/lurk-beta/actions/runs/${{ github.run_id }}" >> $GITHUB_ENV

- name: Amend MESSAGE for benches
if: steps.benches.outcome != 'success'
run: echo "MESSAGE=${{ env.MESSAGE }} Bench compilation failed in https://github.com/lurk-lab/lurk-rs/actions/runs/${{ github.run_id }}" >> $GITHUB_ENV
run: echo "MESSAGE=${{ env.MESSAGE }} Bench compilation failed in https://github.com/argumentcomputer/lurk-beta/actions/runs/${{ github.run_id }}" >> $GITHUB_ENV

- name: Amend MESSAGE for doctests
if: steps.doctests.outcome != 'success'
run: echo "MESSAGE=${{ env.MESSAGE }} Doc test run failed in https://github.com/lurk-lab/lurk-rs/actions/runs/${{ github.run_id }}" >> $GITHUB_ENV
run: echo "MESSAGE=${{ env.MESSAGE }} Doc test run failed in https://github.com/argumentcomputer/lurk-beta/actions/runs/${{ github.run_id }}" >> $GITHUB_ENV

- name: Find the last report issue open
id: last_issue
Expand Down Expand Up @@ -103,12 +103,12 @@ jobs:
automated issue

unused-dependencies:
uses: lurk-lab/ci-workflows/.github/workflows/unused-deps.yml@main
uses: argumentcomputer/ci-workflows/.github/workflows/unused-deps.yml@main
with:
packages: 'protobuf-compiler libprotobuf-dev'

rust-version-check:
uses: lurk-lab/ci-workflows/.github/workflows/rust-version-check.yml@main
uses: argumentcomputer/ci-workflows/.github/workflows/rust-version-check.yml@main

typos:
uses: lurk-lab/ci-workflows/.github/workflows/typos.yml@main
uses: argumentcomputer/ci-workflows/.github/workflows/typos.yml@main
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "lurk-lib"]
path = lurk-lib
url = https://github.com/lurk-lab/lurk-lib.git
url = https://github.com/argumentcomputer/lurk-lib.git
2 changes: 1 addition & 1 deletion CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ representative at an online or offline event.
## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported to the community leaders responsible for enforcement at community@lurk-lab.com.
reported to the community leaders responsible for enforcement at community@argument.xyz.
All complaints will be reviewed and investigated promptly and fairly.

All community leaders are obligated to respect the privacy and security of the
Expand Down
26 changes: 13 additions & 13 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,25 +62,25 @@ flowchart TD
## Issues
We use GitHub issues to track public bugs. Please ensure your description is clear and has sufficient instructions to be able to reproduce the issue.

## Lurk-rs Repository Organization and Dependency Management
## Lurk-beta Repository Organization and Dependency Management

Welcome to the Lurk-rs project! Here's an introduction to the branch organization and the chain of dependencies in the Lurk-rs repository.
Welcome to the Lurk-beta project! Here's an introduction to the branch organization and the chain of dependencies in the Lurk-beta repository.

### Major Dependencies

The main repo is [lurk-rs](https://github.com/lurk-lab/lurk-rs) with major dependencies:
The main repo is [lurk-beta](https://github.com/argumentcomputer/lurk-beta) with major dependencies:

- [bellpepper](https://github.com/lurk-lab/bellpepper)
- [neptune](https://github.com/lurk-lab/neptune)
- [arecibo](https://github.com/lurk-lab/arecibo) - a fork of the upstream repo [nova](https://github.com/microsoft/Nova)
- [bellpepper](https://github.com/argumentcomputer/bellpepper)
- [neptune](https://github.com/argumentcomputer/neptune)
- [arecibo](https://github.com/argumentcomputer/arecibo) - a fork of the upstream repo [nova](https://github.com/microsoft/Nova)

### Forked Dependencies

Additionally, Lurk-rs depends on the following forked repositories:
Additionally, Lurk-beta depends on the following forked repositories:

- [pasta_curves](https://github.com/lurk-lab/pasta_curves) (forked from [zcash/pasta_curves](https://github.com/zcash/pasta_curves))
- [pasta-msm](https://github.com/lurk-lab/pasta-msm) (forked from [supranational/pasta-msm](https://github.com/supranational/pasta-msm))
- [ec-gpu](https://github.com/lurk-lab/ec-gpu) (forked from [filecoin-project/ec-gpu](https://github.com/filecoin-project/ec-gpu))
- [pasta_curves](https://github.com/argumentcomputer/pasta_curves) (forked from [zcash/pasta_curves](https://github.com/zcash/pasta_curves))
- [pasta-msm](https://github.com/argumentcomputer/pasta-msm) (forked from [supranational/pasta-msm](https://github.com/supranational/pasta-msm))
- [ec-gpu](https://github.com/argumentcomputer/ec-gpu) (forked from [filecoin-project/ec-gpu](https://github.com/filecoin-project/ec-gpu))

For rapid iterations and to address issues in these dependencies, Lurk's **main** branch directly depends on the **dev** branch of its dependencies (transitively).

Expand All @@ -105,7 +105,7 @@ For rapid iterations and to address issues in these dependencies, Lurk's **main*

```mermaid
graph TD
LURK[lurk-rs] --> BELL[bellpepper]
LURK[lurk-beta] --> BELL[bellpepper]
LURK --> NEPT[neptune]
LURK --> AREC[arecibo]
AREC --> NOVA[nova]
Expand All @@ -129,9 +129,9 @@ To trigger a benchmark:

Then, check the following link for the benchmark reports:

https://lurk-lab.github.io/lurk-rs/benchmarks/criterion/reports/
https://argumentcomputer.github.io/lurk-beta/benchmarks/criterion/reports/

Ask a maintainer for a benchmark report if you can't find a recent one.

## License
By contributing to lurk-lang, you agree that your contributions will be licensed under both [MIT](https://opensource.org/license/MIT) and [Apache 2.0](http://www.apache.org/licenses/LICENSE-2.0) licenses.
By contributing to `lurk-beta`, you agree that your contributions will be licensed under both [MIT](https://opensource.org/license/MIT) and [Apache 2.0](http://www.apache.org/licenses/LICENSE-2.0) licenses.
20 changes: 10 additions & 10 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ repository.workspace = true
authors.workspace = true
homepage.workspace = true
license.workspace = true
rust-version = "1.74.1" # allows msrv verify to work in CI
rust-version = "1.79" # allows msrv verify to work in CI

[dependencies]
anyhow = { workspace = true }
Expand Down Expand Up @@ -56,14 +56,14 @@ thiserror = { workspace = true }
abomonation = { workspace = true }
abomonation_derive = { version = "0.1.0", package = "abomonation_derive_ng" }
byteorder = "1.4.3"
circom-scotia = { git = "https://github.com/lurk-lab/circom-scotia", branch = "main" }
circom-scotia = { git = "https://github.com/argumentcomputer/circom-scotia", branch = "main" }
sha2 = { version = "0.10.2" }
reqwest = { version = "0.12.2", features = ["stream", "blocking"] }
ansi_term = "0.12.1"
tracing = { workspace = true }
tracing-texray = { workspace = true }
tracing-subscriber = { workspace = true, features = ["env-filter"] }
elsa = { version = "1.9.0", git = "https://github.com/lurk-lab/elsa", branch = "sync_frozen", features = ["indexmap"] }
elsa = { version = "1.9.0", git = "https://github.com/argumentcomputer/elsa", branch = "sync_frozen", features = ["indexmap"] }
arc-swap = "1.6.0"
halo2curves = { version = "0.6.0", features = ["bits", "derive_serde"] }

Expand Down Expand Up @@ -117,15 +117,15 @@ members = ["foil", "lurk-macros", "lurk-metrics", "chain-server"]
[workspace.dependencies]
abomonation = "0.7.3"
anyhow = "1.0.72"
bellpepper = { git = "https://github.com/lurk-lab/bellpepper", branch = "dev" }
bellpepper = { git = "https://github.com/argumentcomputer/bellpepper", branch = "dev" }
bellpepper-core = { version = "0.4.0" }
bincode = "1.3.3"
camino = "1.1.6"
clap = "4.3.17"
ff = "0.13"
metrics = "0.23.0"
neptune = { git = "https://github.com/lurk-lab/neptune", branch = "dev", default-features = false, features = ["abomonation"] }
nova = { git = "https://github.com/lurk-lab/arecibo", branch = "dev", package = "arecibo", features = ["abomonate"]}
neptune = { git = "https://github.com/argumentcomputer/neptune", branch = "dev", default-features = false, features = ["abomonation"] }
nova = { git = "https://github.com/argumentcomputer/arecibo", branch = "dev", package = "arecibo", features = ["abomonate"]}
once_cell = "1.18.0"
pairing = { version = "0.23" }
pasta_curves = { version = "0.5.0" }
Expand All @@ -143,12 +143,12 @@ tracing-subscriber = "0.3.17"
# All workspace members should inherit these keys
# for package declarations.
[workspace.package]
authors = ["Lurk Lab Engineering <engineering@lurk-lab.com>"]
authors = ["Argument Engineering <engineering@argument.xyz>"]
edition = "2021"
homepage = "https://lurk-lang.org/"
license = "MIT OR Apache-2.0"
repository = "https://github.com/lurk-lab/lurk-rs"
rust-version = "1.74.1"
homepage = "https://argument.xyz"
repository = "https://github.com/argumentcomputer/lurk-beta"
rust-version = "1.79"

[[bin]]
name = "lurk"
Expand Down
2 changes: 1 addition & 1 deletion LICENSE-MIT
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2023 Lurk Lab
Copyright (c) 2023 Argument Computer Corporation

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
Loading