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.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Improved version of Deposit contract #51

Merged
merged 131 commits into from
May 17, 2024
Merged

Improved version of Deposit contract #51

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
131 commits
Select commit Hold shift + click to select a range
843bc0b
merge improved deposit contract with integration tests
jonas089 Mar 26, 2024
7e8625a
remove outdated readme, due for recreation
jonas089 Mar 26, 2024
5337582
bugfix: do not add the caller to the admin list
jonas089 Mar 26, 2024
c453024
dotenv -> dotenvy
jonas089 Mar 26, 2024
59d2d41
casper deps from crates.io
jonas089 Mar 26, 2024
b625d1a
Update contracts/deposit-contracts/Cargo.toml
jonas089 Mar 26, 2024
7cd7559
Update contracts/contract-types/Cargo.toml
jonas089 Mar 26, 2024
ce530f6
Update contracts/deposit-contracts/malicious-reader/Cargo.toml
jonas089 Mar 27, 2024
1c83c18
Update contracts/deposit-contracts/withdrawal-session/Cargo.toml
jonas089 Mar 27, 2024
2acfaaf
Update contracts/deposit-contracts/malicious-session/Cargo.toml
jonas089 Mar 27, 2024
aeea7ed
Update contracts/deposit-contracts/deposit-session/Cargo.toml
jonas089 Mar 27, 2024
13b946f
Update contracts/contract-types/Cargo.toml
jonas089 Mar 27, 2024
3e2423c
Update contracts/deposit-contract-tests/Cargo.toml
jonas089 Mar 27, 2024
90a8c06
Update contracts/deposit-contracts/contract/Cargo.toml
jonas089 Mar 27, 2024
a10d11e
Update contracts/deposit-contract-tests/src/test_fixture.rs
jonas089 Mar 27, 2024
50d36df
Update contracts/deposit-contract-tests/src/test_fixture.rs
jonas089 Mar 27, 2024
6e9a17b
Update contracts/deposit-contract-tests/src/test_fixture/utils.rs
jonas089 Mar 27, 2024
1899d7a
remove the withdrawal EP, add comments, explain malicious session cod…
jonas089 Mar 27, 2024
3370111
add .env to gitignore for contract tests
jonas089 Mar 27, 2024
14b709c
remove .env
jonas089 Mar 27, 2024
4c90b4d
improved tests and expect rather than unwrap in session code
jonas089 Mar 28, 2024
7827f9e
improve existing tests, add comments, add tests for access control / …
jonas089 Mar 28, 2024
9666736
improve deposit contract error handling by being more explicit and ad…
jonas089 Mar 28, 2024
d053438
update function name for contract installation
jonas089 Mar 28, 2024
2c215a6
add constants for EP names, minor cleanups
jonas089 Mar 28, 2024
0732633
remove upgradability from deposit contract
jonas089 Mar 28, 2024
9af7c30
kairos-contracts: package with nix
marijanp Mar 28, 2024
9b1bc57
ci: build kairos-contracts
marijanp Mar 28, 2024
c7a6960
ci: run on any pull request
marijanp Mar 28, 2024
eec3780
flake/kairos-contracts: add darwin targets
marijanp Mar 28, 2024
8bdae6c
flake/checks: add kairos-contract check outputs
marijanp Mar 28, 2024
9e27d13
deposit-contracts-tests: fix linter warnings
marijanp Mar 28, 2024
52b9016
flake/kairos: ignore contracts
marijanp Mar 28, 2024
cbb1a52
flake/kairos-contracts: remove unused mv comment
marijanp Mar 28, 2024
62f6ec6
flake/kairos-contracts: remove darwin targets
marijanp Mar 28, 2024
5498538
kairos-contracts-test: refactor to test only crate
marijanp Mar 28, 2024
f9c63f4
kairos-contracts: dont exclude deposit-contracts
marijanp Mar 28, 2024
d322a57
flake/coverage-report: fix issue with rust-nightly and tarpaulin
marijanp Mar 28, 2024
a06b8dc
kairos-contracts: fix linter issues
marijanp Mar 28, 2024
c512fc2
kairos-contracts: rename workspace name
marijanp Mar 28, 2024
23d0db2
flake/rust: use latest toolchain
marijanp Mar 29, 2024
9fddb76
Merge pull request #55 from cspr-rad/nixify-deposit
marijanp Mar 29, 2024
53a1a30
Merge remote-tracking branch 'origin/main' into feature/deposit-contract
marijanp Mar 29, 2024
39a0535
rename contracts -> kairos-contracts
marijanp Mar 29, 2024
8303247
kairos-test-utils: fix lint error
marijanp Mar 29, 2024
ac334b0
propagate optional argument errors in utils.rs
jonas089 Mar 31, 2024
d8c908d
improve comments in main.rs & remove unused variable
jonas089 Mar 31, 2024
fb06eed
Merge branch 'main' into feature/deposit-contract
marijanp Apr 1, 2024
d8593c8
Merge branch 'main' into feature/deposit-contract
marijanp Apr 3, 2024
c55b5ad
Merge branch 'main' into feature/deposit-contract
marijanp Apr 4, 2024
b44b3ae
additional test cases, CES deposit event
jonas089 Apr 4, 2024
61471cc
create a locked contract and store contract package in installer name…
jonas089 Apr 4, 2024
e5a98f8
Merge pull request #66 from cspr-rad/main
jonas089 Apr 4, 2024
73fef22
fix linter warnings
marijanp Apr 5, 2024
ba4e580
remove access control -> self governance and mono contract design for…
jonas089 Apr 15, 2024
f81652d
minor resturcturing of test_fixture crate for demo-contract
jonas089 Apr 15, 2024
095a8e4
flake/coverage: remove -Cstrip=none rust flag
marijanp Apr 15, 2024
3e8ec27
flake: update nixpkgs
marijanp Apr 15, 2024
f9affdf
flake/risc0pkgs: don't follow our nixpkgs revision
marijanp Apr 15, 2024
d2c2c10
kairos-contracts/demo-contracts-test: remove unused import
marijanp Apr 15, 2024
25352c3
Merge pull request #69 from cspr-rad/remove-cstrip-option
jonas089 Apr 17, 2024
42afe4c
improve function name for callstack element
jonas089 Apr 18, 2024
0dca31e
add abstract for submit_batch entry point
jonas089 Apr 18, 2024
3458cd0
add counter query function for 1.5.x, using Casper Client as a library
jonas089 Apr 22, 2024
559634b
add missing newlines at end of file
marijanp Apr 22, 2024
870dc97
add contract utils for installation and counter query
jonas089 Apr 23, 2024
44a7c6e
Merge branch 'feature/deposit-contract' into feature/counter-query
jonas089 Apr 23, 2024
602a0e5
Merge pull request #76 from cspr-rad/feature/counter-query
jonas089 Apr 23, 2024
ef1d2c3
apply clippy suggestions
jonas089 Apr 23, 2024
ade4d3c
default arbitrary RPC id to 0
jonas089 Apr 26, 2024
328c222
depend on casper node with risc0 verifier
jonas089 Apr 29, 2024
0cab310
flake: update fenix
marijanp Apr 29, 2024
7536053
Merge remote-tracking branch 'origin/main' into feature/deposit-contract
marijanp Apr 29, 2024
21b8328
Merge remote-tracking branch 'origin/main' into feature/deposit-contract
marijanp Apr 29, 2024
7c69acc
update Cargo.lock
marijanp Apr 29, 2024
377cd69
kairos-l1-utils: fix integration test
marijanp Apr 29, 2024
07f623c
flake/kairos: don't filter kairos-contracts and kairos-l1-utils
marijanp Apr 29, 2024
a54da4c
kairos-contracts/demo-contract: remove unused import
marijanp Apr 29, 2024
3ccd97c
kairos-l1-utils: add all-tests feature and cctl-tests feature
marijanp Apr 30, 2024
af1c00a
add function to query contract urefs
jonas089 Apr 30, 2024
b428c69
depend on casper-client from crates.io
jonas089 Apr 30, 2024
f536bb1
typecheck for amount - u64
jonas089 Apr 30, 2024
9b7733e
remove unused code
jonas089 Apr 30, 2024
5f38284
fix u64 unwrap error
jonas089 Apr 30, 2024
11ed98d
remove .DS_Store
jonas089 Apr 30, 2024
3a19d12
use latest nightly
jonas089 Apr 30, 2024
75a57d5
reintroduce nightly version lock & update
jonas089 Apr 30, 2024
dfec934
Add wasm32-unknown-unknown to deposit-contract rust-toolchain.toml & …
Avi-D-coder Apr 30, 2024
abdf5cc
Provide more toolchain components in deposit-contract workspace
Avi-D-coder Apr 30, 2024
36f1736
move nested workspace to root, fix pathbuf in tests
jonas089 May 1, 2024
bbc25f1
add test that queries last_processed_deposit_counter
jonas089 May 1, 2024
e272f3b
fix formatting
jonas089 May 1, 2024
aa86bd3
temporary fix
jonas089 May 2, 2024
3b599c8
Fix nix build
Avi-D-coder May 3, 2024
ea90d7f
Merge remote-tracking branch 'origin/main' into feature/deposit-contract
marijanp May 8, 2024
9454305
kairos-l1-utils: format
marijanp May 8, 2024
589941e
fix lint errors
marijanp May 8, 2024
40822ed
kairos-test-utils: wait for block 1
marijanp May 8, 2024
606fd1d
kairos-l1-utils: remove
marijanp May 8, 2024
2cd0cb4
demo-contract-tests: refactor fixture and tests
marijanp May 9, 2024
f54df4f
demo-contract-tests: refactor fixture
marijanp May 9, 2024
33ea2fc
demo-contract-tests: add tests to check that admin can't take funds
marijanp May 9, 2024
5f04db2
demo-contract-tests: remove unused dependency
marijanp May 9, 2024
164a60b
don't ignore .env
marijanp May 9, 2024
34a0738
demo-contract: remove u64::from
marijanp May 9, 2024
5a2a899
Merge branch 'main' into deposit-contract-marijan
marijanp May 9, 2024
496d377
fix lockfile
marijanp May 9, 2024
5da25a9
demo-contract: account -> depositor
marijanp May 9, 2024
09da0ad
demo-contract: minor init refactor
marijanp May 9, 2024
b663b89
demo-contract: remove timestamp from deposit event
marijanp May 9, 2024
da68b21
Merge pull request #95 from cspr-rad/deposit-contract-marijan
marijanp May 15, 2024
2e05eb8
Merge branch 'main' into feature/deposit-contract
marijanp May 15, 2024
5241499
update lockfile
marijanp May 15, 2024
8440fa4
Remove outdated comment about security badges.
koxu1996 May 17, 2024
25a70d1
Simplify comment about contract utilities.
koxu1996 May 17, 2024
9ec324f
Remove unused `test-support` feature from contract dependency.
koxu1996 May 17, 2024
8d648e4
Remove unused `bincode` dependency and use `no-std-helpers`.
koxu1996 May 17, 2024
b17471f
Remove unused `base64` dependency.
koxu1996 May 17, 2024
46b1fc4
Unify format of `Cargo.toml` files.
koxu1996 May 17, 2024
0709c3e
Switch to Casper dependencies from crates.
koxu1996 May 17, 2024
8cf3bc5
Disable default features where possible.
koxu1996 May 17, 2024
757c612
Fix misplaced args with contract package/uref.
koxu1996 May 17, 2024
8010d8e
Stored contract name is actually a contract hash.
koxu1996 May 17, 2024
4bcb72e
Avoid using "deposit contract" name.
koxu1996 May 17, 2024
5ef3efd
Switch back to stable toolchain for non-WASM targets.
koxu1996 May 17, 2024
ce89f53
Replace compile-time env with helper for WASM directory.
koxu1996 May 17, 2024
fe652c1
Add `wasm-opt` dependency.
koxu1996 May 17, 2024
6119d49
Run WASM optimization in tests runtime.
koxu1996 May 17, 2024
42fff34
Refactor WASM helper for tests.
koxu1996 May 17, 2024
0c3ff1a
Revert "Switch back to stable toolchain for non-WASM targets."
koxu1996 May 17, 2024
a5b73c6
Merge pull request #102 from cspr-rad/deposit-contract-suggestions
koxu1996 May 17, 2024
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
5 changes: 4 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,12 @@ members = [
"kairos-tx",
]

exclude = [
"contracts"
]

[workspace.package]
name = "kairos"
version = "0.1.0"
edition = "2021"
license = "MIT OR Apache-2.0"

Loading
Loading