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

Incoming proxy #76

Merged
merged 40 commits into from
Jan 3, 2024
Merged

Incoming proxy #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
0ebc458
use creator for withdraw address
taitruong Dec 13, 2023
659c87e
update branch
taitruong Dec 28, 2023
d74b39d
use cw721-base with withdraw address
taitruong Dec 28, 2023
3a06220
fix tests
taitruong Dec 28, 2023
3b6aac1
rename proxy > outgoing proxy
taitruong Dec 12, 2023
de167a3
fix test
taitruong Dec 12, 2023
26ee914
update libs
taitruong Dec 12, 2023
8b808ee
optional incoming proxy
taitruong Dec 27, 2023
e8f22b4
cargo clippy and fmt
taitruong Dec 27, 2023
7c5e9c3
move types to dedicated package
taitruong Dec 27, 2023
f5bba4c
cleanup
taitruong Dec 27, 2023
b8fcdca
integration test for incoming proxy
taitruong Dec 27, 2023
61a96cb
cleanup
taitruong Dec 27, 2023
0921f66
test sending to non-WLed channel in incoming proxy
taitruong Dec 27, 2023
a488a23
cleanup
taitruong Dec 27, 2023
4e2f400
docs
taitruong Dec 27, 2023
b1f5c07
use double quote to prevent globbing and word splitting
taitruong Dec 27, 2023
60277c0
fix CI
taitruong Dec 27, 2023
49667d5
cleanup based on review by humanalgorithm
taitruong Dec 28, 2023
c46edd4
remove ReceiveProxyNft (handled now by ReceiveNft)
taitruong Dec 30, 2023
9ec55ed
cleanup
taitruong Dec 30, 2023
549e9a0
cleanup
taitruong Dec 30, 2023
10d64ed
ts-relayer test for receive nft via outgoing proxy
taitruong Dec 30, 2023
0cdc119
fix test
taitruong Dec 30, 2023
28d28fe
cleanup
taitruong Dec 30, 2023
fee2aaa
cleanup
taitruong Dec 30, 2023
03091a0
moved to helper
taitruong Dec 30, 2023
88ae912
increase capacity to 3
taitruong Dec 30, 2023
62e118e
update versions
taitruong Dec 30, 2023
a7a4778
docs
taitruong Dec 30, 2023
b930ded
detailed docs on receive nft
taitruong Dec 31, 2023
f8c42c0
update libs
taitruong Dec 31, 2023
84ed066
update lib
taitruong Dec 31, 2023
565f56e
update wasm files for tests
taitruong Jan 1, 2024
d796fc9
update cw721-proxy
taitruong Jan 1, 2024
8bcfc38
update incoming wasm
taitruong Jan 1, 2024
3ec3ed5
update incoming proxy
taitruong Jan 1, 2024
a2d4965
use tag cw-721proxy v0.1.0
taitruong Jan 2, 2024
1fadd3b
rename cw721 -> cw-ics721
taitruong Jan 2, 2024
0b4fd68
cw-ics721-proxy: update lib
taitruong Jan 2, 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
378 changes: 250 additions & 128 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

34 changes: 18 additions & 16 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,35 +7,37 @@ edition = "2021"

[workspace.dependencies]
# common libs
anyhow = "1.0"
anyhow = "^1.0"
bech32 = "^0.9"
cosmwasm-std = "1.2"
cosmwasm-schema = "1.2"
cosmwasm-storage = "1.2"
cw-ownable = "0.5.0"
cw-paginate-storage = { version = "2.2.0", git = "https://github.com/DA0-DA0/dao-contracts.git" }
cosmwasm-std = "^1.5"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should use explicit versions for contracts so versions aren't ambiguous.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually explicit versions are defined in Cargo.lock. By using "^" makes it easier for updating to latest patch version (0.0.x). cw-nfts does the same.

cosmwasm-schema = "^1.5"
cosmwasm-storage = "^1.5"
cw-ownable = "^0.5"
cw-paginate-storage = { version = "^2.4", git = "https://github.com/DA0-DA0/dao-contracts.git" }
cw-storage-plus = "1.1"
cw2 = "1.1"
cw721 = "0.18"
cw721 = { git = "https://github.com/CosmWasm/cw-nfts", branch = "main"} # TODO switch to version 0.18.1/0.19.0, once released
cw721-016 = { version = "0.16.0", package = "cw721" }
cw721-base = "0.18"
cw721-base = { git = "https://github.com/CosmWasm/cw-nfts", branch = "main"} # TODO switch to version 0.18.1/0.19.0, once released
cw721-base-016 = { version = "0.16.0", package = "cw721-base" }
cw721-proxy-derive = { git = "https://github.com/arkprotocol/cw721-proxy.git", tag = "v0.0.7" }
cw721-rate-limited-proxy = { git = "https://github.com/arkprotocol/cw721-proxy.git", tag = "v0.0.7" }
cw-multi-test = { version = "0.18", features = ["cosmwasm_1_2"] }
cw-utils = "1.0"
cw-ics721-incoming-proxy = { git = "https://github.com/arkprotocol/cw-ics721-proxy.git", tag = "v0.1.0" }
cw-ics721-incoming-proxy-base = { git = "https://github.com/arkprotocol/cw-ics721-proxy.git", tag = "v0.1.0" }
cw-ics721-outgoing-proxy-rate-limit = { git = "https://github.com/arkprotocol/cw-ics721-proxy.git", tag = "v0.1.0" }
cw-multi-test = { version = "^0.20", features = ["cosmwasm_1_2"] }
cw-utils = "^1.0"
sha2 = "^0.10"
serde = "1.0"
thiserror = "1"
serde = "^1.0"
thiserror = "^1.0"
# Stargaze libs
sg-std = "^3.2"
sg-multi-test = "^3.1"
sg721 = "^3.1"
sg721-base = "^3.1"
sg721 = "^3.3"
sg721-base = "^3.3"
# packages and contracts
cw-cii = { path = "./packages/cw-cii" }
cw-pause-once = { path = "./packages/cw-pause-once" }
ics721 = { path = "./packages/ics721" }
ics721-types = { path = "./packages/ics721-types" }
zip-optional = { path = "./packages/zip-optional" }
ics721-base = { path = "./contracts/ics721-base"}
ics721-base-tester = { path = "./contracts/cw-ics721-base-tester"}
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ Pause functionality is designed to allow for quick pauses by a trusted group, wi

After a pause, the ICS721 contract will remain paused until governance chooses to unpause it. During the unpause process governance may appoint a new subDAO or reappoint the existing one as pause manager. It is imagined that the admin of this contract will be a chain's community pool, and the pause manager will be a small, active subDAO. This process means that the subDAO may pause the contract in the event of a problem, but may not lock the contract, as in pausing the contract the subDAO burns its ability to do so again.

Filtering is enabled by an optional proxy that the ICS721 contract may be configured to use. If a proxy is configured, the ICS721 contract will only accept NFTs delivered by the proxy address. This proxy interface is very minimal and enables very flexible rate limiting and filtering. Currently, per-collection rate limiting is implemented. Users of this ICS721 contract are encouraged to implement their own filtering regimes and may add them to the [proxy repository](https://github.com/arkprotocol/cw721-proxy) so that others may use them.
Filtering is enabled by an optional proxy that the ICS721 contract may be configured to use. If a proxy is configured, the ICS721 contract will only accept NFTs delivered by the proxy address. This proxy interface is very minimal and enables very flexible rate limiting and filtering. Currently, per-collection rate limiting is implemented. Users of this ICS721 contract are encouraged to implement their own filtering regimes and may add them to the [proxy repository](https://github.com/arkprotocol/cw-ics721-proxy) so that others may use them.

## Failure handling errata

Expand Down
Loading