Incoming proxy

Cargo.toml

@@ -16,12 +16,11 @@ 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 = { git = "https://github.com/arkprotocol/cw-nfts", branch = "withdrawal_address"} # TODO switch to official repo, once merged
+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 = { git = "https://github.com/arkprotocol/cw-nfts", branch = "withdrawal_address"} # TODO switch to official repo, once merged
+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-incoming-proxy = { git = "https://github.com/arkprotocol/cw721-proxy.git" }
-cw721-outgoing-proxy-derive = { git = "https://github.com/arkprotocol/cw721-proxy.git" }
 cw721-outgoing-proxy-rate-limit = { git = "https://github.com/arkprotocol/cw721-proxy.git" }
 cw-multi-test = { version = "^0.20", features = ["cosmwasm_1_2"] }
 cw-utils = "^1.0"

contracts/ics721-base-tester/src/contract.rs

@@ -5,7 +5,7 @@ use cosmwasm_std::{
     StdResult, WasmMsg,
 };
 use cw2::set_contract_version;
-use ics721_types::ibc_types::NonFungibleTokenPacketData;
+use ics721_types::ibc_types::{IbcOutgoingMsg, NonFungibleTokenPacketData};
 
 use crate::{
     error::ContractError,
@@ -220,7 +220,7 @@ fn execute_send_nft(
         msg: to_json_binary(&cw721::Cw721ExecuteMsg::SendNft {
             contract: ics721,
             token_id,
-            msg: to_json_binary(&ics721::msg::IbcOutgoingMsg {
+            msg: to_json_binary(&IbcOutgoingMsg {
                 receiver: recipient,
                 channel_id,
                 timeout: IbcTimeout::with_timestamp(env.block.time.plus_seconds(1000)),

contracts/sg-ics721/src/testing/integration_tests.rs

@@ -17,12 +17,15 @@ use cw_pause_once::PauseError;
 use ics721::{
     execute::Ics721Execute,
     ibc::Ics721Ibc,
-    msg::{CallbackMsg, ExecuteMsg, IbcOutgoingMsg, InstantiateMsg, MigrateMsg, QueryMsg},
+    msg::{CallbackMsg, ExecuteMsg, InstantiateMsg, MigrateMsg, QueryMsg},
     query::Ics721Query,
     state::CollectionData,
     token_types::VoucherCreation,
 };
-use ics721_types::token_types::{Class, ClassId, Token, TokenId};
+use ics721_types::{
+    ibc_types::{IbcOutgoingMsg, IbcOutgoingProxyMsg},
+    token_types::{Class, ClassId, Token, TokenId},
+};
 use sg721::InstantiateMsg as Sg721InstantiateMsg;
 use sg721_base::msg::{CollectionInfoResponse, QueryMsg as Sg721QueryMsg};
 use sha2::{digest::Update, Digest, Sha256};
@@ -1988,23 +1991,71 @@ fn test_do_instantiate_and_mint_permissions() {
     assert_eq!(err, ContractError::Unauthorized {});
 }
 
-/// Tests that we can not proxy NFTs if no proxy is configured.
+/// Tests that we can not send IbcOutgoingProxyMsg if no proxy is configured.
 #[test]
-fn test_no_proxy_unauthorized() {
+fn test_no_proxy_unknown_msg() {
     let mut test = Test::new(false, false, None, None, sg721_base_contract());
+    let msg = IbcOutgoingProxyMsg {
+        collection: "foo".to_string(),
+        msg: to_json_binary(&IbcOutgoingMsg {
+            receiver: test.app.api().addr_make(NFT_OWNER_TARGET_CHAIN).to_string(),
+            channel_id: "channel-0".to_string(),
+            timeout: IbcTimeout::with_block(IbcTimeoutBlock {
+                revision: 0,
+                height: 10,
+            }),
+            memo: None,
+        })
+        .unwrap(),
+    };
     let err: ContractError = test
         .app
         .execute_contract(
             test.app.api().addr_make("proxy"),
             test.ics721,
-            &ExecuteMsg::ReceiveProxyNft {
-                eyeball: "nft".to_string(),
-                msg: cw721::Cw721ReceiveMsg {
-                    sender: test.app.api().addr_make(NFT_OWNER_TARGET_CHAIN).to_string(),
-                    token_id: "1".to_string(),
-                    msg: to_json_binary("").unwrap(),
-                },
-            },
+            &ExecuteMsg::ReceiveNft(cw721::Cw721ReceiveMsg {
+                sender: test.app.api().addr_make(NFT_OWNER_TARGET_CHAIN).to_string(),
+                token_id: "1".to_string(),
+                msg: to_json_binary(&msg).unwrap(),
+            }),
+            &[],
+        )
+        .unwrap_err()
+        .downcast()
+        .unwrap();
+    assert_eq!(
+        err,
+        ContractError::UnknownMsg(to_json_binary(&msg).unwrap())
+    );
+}
+
+/// Tests that we can non-proxy addresses can send if proxy is configured.
+#[test]
+fn test_no_proxy_unauthorized() {
+    let mut test = Test::new(true, false, None, None, sg721_base_contract());
+    let msg = IbcOutgoingProxyMsg {
+        collection: "foo".to_string(),
+        msg: to_json_binary(&IbcOutgoingMsg {
+            receiver: test.app.api().addr_make(NFT_OWNER_TARGET_CHAIN).to_string(),
+            channel_id: "channel-0".to_string(),
+            timeout: IbcTimeout::with_block(IbcTimeoutBlock {
+                revision: 0,
+                height: 10,
+            }),
+            memo: None,
+        })
+        .unwrap(),
+    };
+    let err: ContractError = test
+        .app
+        .execute_contract(
+            test.app.api().addr_make("foo"),
+            test.ics721,
+            &ExecuteMsg::ReceiveNft(cw721::Cw721ReceiveMsg {
+                sender: test.app.api().addr_make(NFT_OWNER_TARGET_CHAIN).to_string(),
+                token_id: "1".to_string(),
+                msg: to_json_binary(&msg).unwrap(),
+            }),
             &[],
         )
         .unwrap_err()
@@ -2081,15 +2132,15 @@ fn test_proxy_authorized() {
         .execute_contract(
             proxy_address,
             test.ics721,
-            &ExecuteMsg::ReceiveProxyNft {
-                eyeball: source_cw721.into_string(),
-                msg: cw721::Cw721ReceiveMsg {
-                    sender: test
-                        .app
-                        .api()
-                        .addr_make(COLLECTION_OWNER_SOURCE_CHAIN)
-                        .to_string(),
-                    token_id: "1".to_string(),
+            &ExecuteMsg::ReceiveNft(cw721::Cw721ReceiveMsg {
+                sender: test
+                    .app
+                    .api()
+                    .addr_make(COLLECTION_OWNER_SOURCE_CHAIN)
+                    .to_string(),
+                token_id: "1".to_string(),
+                msg: to_json_binary(&IbcOutgoingProxyMsg {
+                    collection: source_cw721.into_string(),
                     msg: to_json_binary(&IbcOutgoingMsg {
                         receiver: test.app.api().addr_make(NFT_OWNER_TARGET_CHAIN).to_string(),
                         channel_id: "channel-0".to_string(),
@@ -2100,8 +2151,9 @@ fn test_proxy_authorized() {
                         memo: None,
                     })
                     .unwrap(),
-                },
-            },
+                })
+                .unwrap(),
+            }),
             &[],
         )
         .unwrap();

packages/ics721-types/Cargo.toml

@@ -9,5 +9,6 @@ description = "an implementation of the ICS721 specification for transfering NFT
 cosmwasm-std = { workspace = true, features = ["cosmwasm_1_2"] }
 cosmwasm-schema = { workspace = true }
 cw-storage-plus = { workspace = true }
+cw721 = { workspace = true }
 serde = { workspace = true }
 thiserror = { workspace = true }

packages/ics721-types/src/error.rs

@@ -1,7 +1,7 @@
 use thiserror::Error;
 
 #[derive(Error, Debug, PartialEq)]
-pub enum ValidationError {
+pub enum Ics721Error {
     #[error("empty class ID")]
     EmptyClassId {},