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

Proof integration merged #1576

Open
wants to merge 58 commits into
base: master
Choose a base branch
from
Open

Proof integration merged #1576

wants to merge 58 commits into from

Conversation

Cashmaney
Copy link
Member

No description provided.

toml01 and others added 30 commits April 17, 2023 19:17
toml01 and others added 23 commits July 2, 2023 12:14
Added block-long state cache (todo: tests)
# Conflicts:
#	.vscode/settings.json
#	app/app.go
#	cosmwasm/enclaves/Cargo.lock
#	cosmwasm/enclaves/execute/Cargo.toml
#	cosmwasm/enclaves/shared/block-verifier/Cargo.toml
#	cosmwasm/enclaves/shared/block-verifier/src/ecalls.rs
#	cosmwasm/enclaves/shared/block-verifier/src/lib.rs
#	cosmwasm/packages/sgx-vm/src/lib.rs
#	go-cosmwasm/api/callbacks.go
#	go.mod
#	go.sum
# Conflicts:
#	cosmwasm/enclaves/shared/block-verifier/src/ecalls.rs
#	cosmwasm/enclaves/shared/block-verifier/src/wasm_messages.rs
#	cosmwasm/enclaves/shared/contract-engine/src/wasm3/mod.rs
Merge with master, added block level cache
…oof-integration

# Conflicts:
#	.github/workflows/go-lint.yml
#	.vscode/settings.json
#	app/app.go
#	cosmwasm/enclaves/Cargo.lock
#	cosmwasm/enclaves/execute/Cargo.toml
#	cosmwasm/enclaves/execute/Enclave.edl
#	cosmwasm/enclaves/execute/src/lib.rs
#	cosmwasm/enclaves/ffi-types/src/lib.rs
#	cosmwasm/enclaves/shared/block-verifier/Cargo.toml
#	cosmwasm/enclaves/shared/block-verifier/src/wasm_messages.rs
#	cosmwasm/enclaves/shared/contract-engine/Cargo.toml
#	cosmwasm/enclaves/shared/contract-engine/src/contract_operations.rs
#	cosmwasm/enclaves/shared/contract-engine/src/db.rs
#	cosmwasm/enclaves/shared/contract-engine/src/lib.rs
#	cosmwasm/enclaves/shared/contract-engine/src/wasm3/mod.rs
#	cosmwasm/packages/sgx-vm/src/lib.rs
#	cosmwasm/packages/sgx-vm/src/proofs.rs
#	deployment/dockerfiles/Dockerfile
#	go-cosmwasm/Cargo.lock
#	go-cosmwasm/api/bindings.h
#	go-cosmwasm/api/callbacks.go
#	go.mod
#	go.sum
@Cashmaney Cashmaney changed the base branch from compute-root-validation to master November 19, 2023 10:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants