Skip to content

Commit

Permalink
Merge pull request #1 from tez-capital/Qena
Browse files Browse the repository at this point in the history
Qena
  • Loading branch information
cryi authored Sep 29, 2024
2 parents 8a4f391 + 12d606d commit c043841
Show file tree
Hide file tree
Showing 17,568 changed files with 4,577,552 additions and 858,866 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
3 changes: 3 additions & 0 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[env]
CC_wasm32_unknown_unknown="clang"
CC_riscv64gc_unknown_hermit="clang"
25 changes: 25 additions & 0 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Use an official OCaml image based on Alpine Linux
FROM docker.io/ocaml/opam:alpine-3.20-ocaml-4.14

# Set up working directory
WORKDIR /workspace

# Update Alpine packages and install required dependencies
RUN sudo apk update && sudo apk add --no-cache \
build-base \
m4 \
dune \
gmp-dev \
opam \
bash \
git \
git-lfs

# Initialize opam and install OCaml dependencies
RUN opam init --disable-sandboxing --auto-setup && \
opam install dune

# Copy the project into the container
COPY . .

CMD ["bash"]
27 changes: 27 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"name": "OCaml Dune Dev Container",
"build": {
"dockerfile": "./Dockerfile" // Update the path to point to the new location of the Dockerfile
},
"workspaceFolder": "/workspace",
"forwardPorts": [
8080
],
"mounts": [
"source=${localWorkspaceFolder},target=/workspace,type=bind"
],
"remoteUser": "root",
"runArgs": [
"--privileged"
],
"customizations": {
"vscode": {
"settings": {
"terminal.integrated.shell.linux": "/bin/bash"
},
"extensions": [
"ocamllabs.ocaml-platform"
]
}
}
}
35 changes: 28 additions & 7 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ tezos-admin-client
tezos-baker-*
tezos-endorser-*
tezos-accuser-*
tezos-proxy-server
tezos-signer
tezos-smart-rollup-node-*
tezos-smart-rollup-client-*
Expand All @@ -33,10 +32,13 @@ octez-admin-client
octez-baker-*
octez-endorser-*
octez-accuser-*
octez-proxy-server
octez-signer
octez-smart-rollup-node*
octez-smart-rollup-client-*
octez-injector-server
octogram
octez-teztale-archiver
octez-teztale-server

scripts/opam-test-all.sh.DONE
scripts/create_genesis/src
Expand Down Expand Up @@ -74,11 +76,26 @@ _coverage_report
.gitignore
.gitlab-ci.yml

# etherlink
/etherlink/kernels-*

# Rust
target
**/target

evm_kernel.wasm
sequenced_kernel.wasm
evm_installer.wasm
evm_kernel_unstripped.wasm
evm-evaluation-assessor
smart-rollup-installer
_evm_installer_preimages/
tx_kernel.wasm
tx_kernel_dal.wasm
tx-demo-collector
dal_echo_kernel.wasm
sequencer.wasm
evm_benchmark_kernel.wasm
evm_unstripped_installer.wasm
_evm_unstripped_installer_preimages/

# Terraform

Expand All @@ -94,8 +111,8 @@ crash.log
crash.*.log

# Exclude all .tfvars files, which are likely to contain sensitive data, such as
# password, private keys, and other secrets. These should not be part of version
# control as they are data points which are potentially sensitive and subject
# password, private keys, and other secrets. These should not be part of version
# control as they are data points which are potentially sensitive and subject
# to change depending on the environment.
*.tfvars
*.tfvars.json
Expand All @@ -118,4 +135,8 @@ override.tf.json
terraform.rc

# Terraform lock files
*.lock.hcl
*.lock.hcl

# RISC-V
/src/riscv/riscv-sandbox
/src/riscv/riscv-dummy.elf
3 changes: 3 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
CHANGES.rst merge=union
etherlink/CHANGES*.md merge=union

_coverage_output export-ignore
.gitignore export-ignore
.gitattributes export-ignore
Expand Down
63 changes: 49 additions & 14 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@

## /!\ /!\ Update .dockerignore accordingly /!\ /!\

.DS_Store
__pycache__
*.pyc

# temporary files created during snapshotting
*.old

**/_build
/_build_rust
/_opam
Expand Down Expand Up @@ -32,8 +34,6 @@ __pycache__
/octez-endorser-*
/tezos-accuser-*
/octez-accuser-*
/tezos-proxy-server
/octez-proxy-server
/tezos-signer
/octez-signer
/tezos-sandbox
Expand All @@ -49,14 +49,22 @@ __pycache__
/tezos-smart-rollup-node-*
/octez-smart-rollup-node*
/octez-smart-rollup-sequencer-node
/tezos-smart-rollup-client-*
/octez-smart-rollup-client-*
/octez-smart-rollup-wasm-*
/octez-evm-proxy-server
/octez-evm-node
/tezos-dal-node
/octez-dal-node
/octez-dac-*
/octez-binaries
/octez-injector-server
/octez-dsn-node
/octogram
/simulation-scenario
/safety-checker
/octez-teztale-archiver
/octez-teztale-server

/src/riscv/riscv-sandbox*
/src/riscv/riscv-dummy.elf

/src/proto_*/parameters/*-parameters.json

Expand All @@ -67,7 +75,8 @@ __pycache__
/_coverage_output/*.coverage
/_coverage_report

*.install
client-libs/kaitai-struct-files/doc

.merlin

*~
Expand All @@ -88,18 +97,26 @@ __pycache__
**/.venv
**/.mypy_cache/

# Output of the update_opam_repo script
opam_repo.patch

# Rust
target

evm_kernel.wasm
evm_installer.wasm
sequenced_kernel.wasm
evm_kernel_unstripped.wasm
evm-evaluation-assessor
smart-rollup-installer
_evm_installer_preimages/
tx_kernel.wasm
tx_kernel_dal.wasm
tx-demo-collector
dal_echo_kernel.wasm
sequencer.wasm
evm_benchmark_kernel.wasm
evm_unstripped_installer.wasm
_evm_unstripped_installer_preimages/

# etherlink
/etherlink/kernels-*

# Terraform

Expand All @@ -115,8 +132,8 @@ crash.log
crash.*.log

# Exclude all .tfvars files, which are likely to contain sensitive data, such as
# password, private keys, and other secrets. These should not be part of version
# control as they are data points which are potentially sensitive and subject
# password, private keys, and other secrets. These should not be part of version
# control as they are data points which are potentially sensitive and subject
# to change depending on the environment.
*.tfvars
*.tfvars.json
Expand All @@ -139,4 +156,22 @@ override.tf.json
terraform.rc

# Terraform lock files
*.lock.hcl
*.lock.hcl

# Direnv
.direnv

# Emacs
.dir-locals.el

# /src/dune is present in slim mode, absent otherwise.
# Slim mode is a choice and, as such, must not be committed.
/src/dune

# /script-inputs/custom_dune_flags contains a local choice and must not be committed.
/script-inputs/custom_dune_flags

etherlink/scripts/docker-compose/mainnet-docker-compose/.etherlink-mainnet-data/

# Etherlink benchmarks
node_modules/
Loading

0 comments on commit c043841

Please sign in to comment.