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

Port CW3 to Secret #1

Open
wants to merge 28 commits into
base: main
Choose a base branch
from
Open

Port CW3 to Secret #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
2f21b42
Port CW3 to Secret
apollo-bobby Sep 5, 2022
ce7cce5
Remove debug statements, working comments
apollo-bobby Sep 19, 2022
c01f7f1
More debug cleanup, unused code/import removal, change const -> static
apollo-bobby Sep 20, 2022
9a9ec23
Remove voter insertion in execute_propose
apollo-bobby Sep 20, 2022
267f277
Refactoring and bug fixes
apollo-bobby Sep 21, 2022
9934cdb
Update top-level Cargo.toml
apollo-bobby Sep 21, 2022
d25ae1d
Port cw3-flex-multisig
apollo-bobby Sep 21, 2022
70afacf
WIP
apollo-bobby Oct 3, 2022
9492551
Change serialization from Bincode2 to JSON
apollo-bobby Oct 7, 2022
5543fd4
Move BST to storage-plus
apollo-bobby Nov 1, 2022
48a5522
Fixed bug in list_votes() and list_voters()
apollo-bobby Nov 1, 2022
995c9bc
port snapshot stuff (not map)
apollo-bobby Nov 1, 2022
6d41153
Port CW4-Group to Secret Network
apollo-bobby Nov 2, 2022
778cbf3
Fix bug in list_votes() for cw3-flex
apollo-bobby Nov 2, 2022
d890f21
clean up cw3-flex
apollo-bobby Nov 2, 2022
56f2c1a
chore: update dependencies and address review comments
apollo-bobby Feb 13, 2023
c2c08ed
fix: Make BST iterate from next largest element on miss
apollo-bobby Feb 27, 2023
c7d0eae
test: Fix tests failing due to BST iter behavior
apollo-bobby Feb 27, 2023
1282f06
test: Remove comments and todo!() in cw4 test
apollo-bobby Feb 27, 2023
3077125
test: Remove duplicated BST tests
apollo-bobby Mar 1, 2023
9df8d89
fix: Correct BST iter_from() behavior
apollo-bobby Mar 1, 2023
23e6b88
fix: Properly implement iter_from() and update snapshot module to match
apollo-bobby Mar 2, 2023
42e926f
chore: Update iter_from() usage in contracts
apollo-bobby Mar 2, 2023
91c3224
feat: Add largest() and smallest() to BST
apollo-bobby Mar 3, 2023
065a81f
fix: Partial fix for remove_checkpoint and tests
apollo-bobby Mar 3, 2023
6c4e19d
chore: Remove debug printouts
apollo-bobby Mar 3, 2023
6fbc029
feat: Add permit check for querying
apollo-bobby Mar 7, 2023
11b28a2
fix: Add contract address as allowed token in permit query
apollo-bobby Mar 7, 2023
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
657 changes: 418 additions & 239 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

15 changes: 12 additions & 3 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,24 @@
[workspace]
members = [
"contracts/cw3-fixed-multisig",
"contracts/cw20-base",
"packages/controllers",
"contracts/cw3-flex-multisig",
"contracts/cw4-group",
# "contracts/cw4-stake",
"packages/cw2",
"packages/cw3",
# "packages/cw4",
"packages/cw4",
"packages/cw20",
#"packages/multi-test",
"packages/storage-plus",
"packages/utils"]

[workspace.dependencies]
schemars = { version = "0.8.11" }
serde = { version = "1.0" }
cosmwasm-std = { git = "https://github.com/scrtlabs/cosmwasm", tag = "v1.1.9-secret" }
cosmwasm-storage = { git = "https://github.com/scrtlabs/cosmwasm", tag = "v1.1.9-secret" }
secret-toolkit = { git = "https://github.com/scrtlabs/secret-toolkit", default-features = false, features = ["permit", "storage"]}

[profile.release.package.cw3-fixed-multisig]
codegen-units = 1
incremental = false
Expand Down
4 changes: 2 additions & 2 deletions contracts/cw20-base/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ cw-utils = { path = "../../packages/utils", version = "0.13.4" }
cw2 = { path = "../../packages/cw2", version = "0.13.4" }
cw20 = { path = "../../packages/cw20", version = "0.13.4" }
cw-storage-plus = { path = "../../packages/storage-plus", version = "0.13.4" }
cosmwasm-std = { git = "https://github.com/scrtlabs/cosmwasm", branch = "secret" }
schemars = "0.8.1"
cosmwasm-std = { workspace = true }
schemars = "0.8.11"
serde = { version = "1.0.103", default-features = false, features = ["derive"] }
thiserror = { version = "1.0.23" }

Expand Down
6 changes: 4 additions & 2 deletions contracts/cw3-fixed-multisig/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,14 @@ backtraces = ["cosmwasm-std/backtraces"]
library = []

[dependencies]
bech32 = "^0.9.1"
cosmwasm-std = { workspace = true }
cw-utils = { path = "../../packages/utils", version = "0.13.4" }
cw2 = { path = "../../packages/cw2", version = "0.13.4" }
cw3 = { path = "../../packages/cw3", version = "0.13.4" }
cw-storage-plus = { path = "../../packages/storage-plus", version = "0.13.4" }
cosmwasm-std = { git = "https://github.com/scrtlabs/cosmwasm", branch = "secret" }
schemars = "0.8.1"
schemars = "0.8.11"
secret-toolkit = { workspace = true }
serde = { version = "1.0.103", default-features = false, features = ["derive"] }
thiserror = { version = "1.0.23" }

Expand Down
Loading