use altered snip721-reference-impl to define data to return on result

a hack to workaround scrtlabs/SecretNetwork#1323 the workaround: eqoty-labs/snip721-reference-impl@5ae22b4
eqoty-labs · Mar 16, 2023 · a8f1f10 · a8f1f10
1 parent 5085120
commit a8f1f10
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 6 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -13,3 +13,8 @@ codegen-units = 1
 panic = 'abort'
 incremental = false
 overflow-checks = true
+
+[workspace.dependencies]
+snip721-reference-impl = { git = "https://github.com/eqoty-labs/snip721-reference-impl", rev = "5ae22b4" }
+cosmwasm-contract-migratable-std = { git = "https://github.com/eqoty-labs/cosmwasm-contract-migratable-std", tag = "v2.0.0" }
+serde = { version = "1.0.156", default-features = false, features = ["derive"] }
diff --git a/contracts/snip721-dealer/Cargo.toml b/contracts/snip721-dealer/Cargo.toml
@@ -21,10 +21,10 @@ crate-type = ["cdylib", "rlib"]
 #backtraces = ["cosmwasm-std/backtraces"]
 
 [dependencies]
-snip721-reference-impl = { git = "https://github.com/eqoty-labs/snip721-reference-impl", rev = "b92feaa" }
-cosmwasm-contract-migratable-std = { git = "https://github.com/eqoty-labs/cosmwasm-contract-migratable-std", tag = "v2.0.0" }
+snip721-reference-impl = { workspace = true }
+cosmwasm-contract-migratable-std = { workspace = true }
+serde = { workspace = true }
 serde-cw-value = { version = "0.7.0" }
-serde = { version = "1.0.155", default-features = false, features = ["derive"] }
 schemars = "0.8.12"
 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" }

diff --git a/contracts/snip721-dealer/src/contract.rs b/contracts/snip721-dealer/src/contract.rs
@@ -110,6 +110,7 @@ fn init_snip721(
             enable_burn: Some(false),
         }),
         post_init_callback: None,
+        post_init_data: None,
     });
     let instantiate_wasm_msg = WasmMsg::Instantiate {
         code_id: msg.snip721_code_id,

diff --git a/contracts/snip721-dealer/src/test_instantiate.rs b/contracts/snip721-dealer/src/test_instantiate.rs
@@ -360,6 +360,7 @@ mod tests {
                                 enable_burn: Some(false),
                             }),
                             post_init_callback: None,
+                            post_init_data: None,
                         });
                     assert_eq!(expected_snip721_instantiate_msg, snip721_instantiate_msg);
                 }

diff --git a/contracts/snip721-migratable/Cargo.toml b/contracts/snip721-migratable/Cargo.toml
@@ -21,10 +21,10 @@ crate-type = ["cdylib", "rlib"]
 #backtraces = ["cosmwasm-std/backtraces"]
 
 [dependencies]
-snip721-reference-impl = { git = "https://github.com/eqoty-labs/snip721-reference-impl", rev = "b92feaa" }
-cosmwasm-contract-migratable-std = { git = "https://github.com/eqoty-labs/cosmwasm-contract-migratable-std", tag = "v2.0.0" }
+snip721-reference-impl = { workspace = true }
+cosmwasm-contract-migratable-std = { workspace = true }
+serde = { workspace = true }
 serde-cw-value = { version = "0.7.0" }
-serde = { version = "1.0.154", default-features = false, features = ["derive"] }
 schemars = "0.8.12"
 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" }

diff --git a/contracts/snip721-migratable/src/contract_migrate.rs b/contracts/snip721-migratable/src/contract_migrate.rs
@@ -364,6 +364,7 @@ pub(crate) fn migrate(
                     enable_burn: Some(snip721config.burn_is_enabled),
                 }),
                 post_init_callback: None,
+                post_init_data: None,
             },
             migrate_from: MigrateFrom {
                 address: env.contract.address,

diff --git a/contracts/snip721-migratable/src/test_migrate.rs b/contracts/snip721-migratable/src/test_migrate.rs
@@ -271,6 +271,7 @@ mod tests {
                     config: None,
                     symbol: "".to_string(),
                     post_init_callback: None,
+                    post_init_data: None,
                 },
                 migrate_from: MigrateFrom {
                     address: env_0.contract.address.clone(),
@@ -348,6 +349,7 @@ mod tests {
                     config: None,
                     symbol: "".to_string(),
                     post_init_callback: None,
+                    post_init_data: None,
                 },
                 migrate_from: MigrateFrom {
                     address: env_0.contract.address.clone(),

diff --git a/contracts/snip721-migratable/src/test_utils.rs b/contracts/snip721-migratable/src/test_utils.rs
@@ -14,6 +14,7 @@ pub mod test_utils {
             config: None,
             symbol: "".to_string(),
             post_init_callback: None,
+            post_init_data: None,
         })
     }
 }