fix: update borsh & enable migration testing

securesecrets · Feb 2, 2024 · acbc406 · acbc406
1 parent 4818819
commit acbc406
Show file tree

Hide file tree

Showing 41 changed files with 413 additions and 295 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -12,14 +12,16 @@ members = [
 edition = "2021"
 
 [workspace.dependencies]
-borsh = "0.10.3"
+borsh = "1.3.1"
+borsh-derive = "1.3.1"
+
 bincode2 = "2.0.1"
-cosmwasm-std = { package = "secret-cosmwasm-std", version = "1.1.10" }
+cosmwasm-std = { package = "secret-cosmwasm-std", version = "1.1.11" }
 cosmwasm-schema = "1.2.5"
 schemars = "0.8.9"
 serde = { version = "1.0.103", default-features = false, features = ["derive"] }
 thiserror = "1.0"
-ethnum = { git = "https://github.com/securesecrets/ethnum-rs", branch = "v1.1.10-secret" }
+ethnum = { git = "https://github.com/securesecrets/ethnum-rs", branch = "v1.1.11-secret-borsh" }
 primitive-types = { version = "0.12.1", default-features = false }
 
 nanoid = "0.4.0"

diff --git a/README.md b/README.md
@@ -4,8 +4,8 @@ This repo contains some packages from [cw-plus](https://github.com/CosmWasm/cw-p
 
 ## Differences from original repos?
 
-Since Secret Network's `cosmwasm-std` does not support migrations or anything requiring the iterator feature, that functionality has been commented or left out. The `ContractInfo` also has an additional field for `code_hash` so this fork accounts for that difference.
+Since Secret Network's `cosmwasm-std` does not support anything requiring the iterator feature, that functionality has been commented or left out. The `ContractInfo` also has an additional field for `code_hash` so this fork accounts for that difference.
 
 ## Imports
 
-TODO
+TODO
diff --git a/packages/btr-macros/src/borsh.rs b/packages/btr-macros/src/borsh.rs
@@ -33,8 +33,8 @@ pub fn serde_impl(input: DeriveInput) -> DeriveInput {
             #[derive(
                 serde::Serialize,
                 serde::Deserialize,
-                borsh::BorshSerialize,
-                borsh::BorshDeserialize,
+                borsh_derive::BorshSerialize,
+                borsh_derive::BorshDeserialize,
                 Clone,
                 Debug,
                 PartialEq,
@@ -46,8 +46,8 @@ pub fn serde_impl(input: DeriveInput) -> DeriveInput {
             #[derive(
                 serde::Serialize,
                 serde::Deserialize,
-                borsh::BorshSerialize,
-                borsh::BorshDeserialize,
+                borsh_derive::BorshSerialize,
+                borsh_derive::BorshDeserialize,
                 Clone,
                 Debug,
                 PartialEq,
@@ -76,8 +76,8 @@ mod tests {
             #[derive(
                 serde::Serialize,
                 serde::Deserialize,
-                borsh::BorshSerialize,
-                borsh::BorshDeserialize,
+                borsh_derive::BorshSerialize,
+                borsh_derive::BorshDeserialize,
                 Clone,
                 Debug,
                 PartialEq,

diff --git a/packages/math/Cargo.toml b/packages/math/Cargo.toml
@@ -22,6 +22,7 @@ cosmwasm-schema = { workspace = true }
 schemars = { workspace = true }
 serde = { workspace = true }
 borsh = { workspace = true }
+borsh-derive = { workspace = true }
 thiserror = { workspace = true }
 ethnum = { workspace = true, features = ["cosmos", "borsh", "serde", "macros"] }
 primitive-types = { workspace = true }
@@ -34,4 +35,4 @@ btr-macros = { path = "../btr-macros" }
 rstest = { workspace = true }
 criterion = { workspace = true }
 serde_json = { workspace = true }
-proptest = { workspace = true }
+proptest = { workspace = true }
diff --git a/packages/math/src/lib.rs b/packages/math/src/lib.rs
@@ -8,8 +8,8 @@ pub mod asserter;
 mod primitives;
 
 pub mod common;
-pub mod traits;
 pub mod sd59x18;
+pub mod traits;
 pub mod ud60x18;
 
 mod asm;