great refactor

ComposableFi · Nov 25, 2023 · 8e07fff · 8e07fff
1 parent ab34ebb
commit 8e07fff
Show file tree

Hide file tree

Showing 49 changed files with 8 additions and 7 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -32,7 +32,7 @@ num = { version = "^0.4.1", default-features = false }
 enumn = { version = "0.1.12" }
 ibc = { version = "^0.48.0", default-features = false }
 prost-build = { version = "^0.12.2" }
-bech32 = { version = "^0.9.1", default-features = false, features = ["alloc"]  }
+bech32 = { version = "^0.9.1", default-features = false }
 cosmwasm-std = { version = "^1.5.0", features = [
     "iterator",
 ], default-features = false }

diff --git a/contracts/cosmwasm/executor/Cargo.toml b/contracts/cosmwasm/executor/Cargo.toml
@@ -11,7 +11,7 @@ crate-type = ["cdylib", "rlib"]
 
 [features]
 library = []
-std = ["xc-core/std", "dep:cosmwasm-schema", "dep:serde_json"]
+std = ["cvm-runtime/std", "dep:cosmwasm-schema", "dep:serde_json"]
 default = ["std"]
 
 [dependencies]
@@ -30,6 +30,6 @@ serde-json-wasm = { workspace = true }
 serde-cw-value = { workspace = true }
 thiserror = { workspace = true }
 prost = { workspace = true, features = ["prost-derive"] }
-xc-core = { path = "../../../lib/core", features = [
+cvm-runtime = { path = "../../../crates/cvm-runtime", features = [
   "cosmwasm",
 ], default-features = false }
diff --git a/contracts/cosmwasm/gateway/Cargo.toml b/contracts/cosmwasm/gateway/Cargo.toml
@@ -14,7 +14,7 @@ workspace = true
 
 [features]
 library = []
-std = ["cw-xc-executor/std", "xc-core/std"]
+std = ["cw-xc-executor/std", "cvm-runtime/std"]
 default = ["std"]
 
 [dependencies]
@@ -34,7 +34,8 @@ thiserror = { workspace = true }
 cw-xc-executor = { path = "../executor", features = [
   "library",
 ], default-features = false }
-xc-core = { path = "../../../lib/core", features = [
+
+cvm-runtime = { path = "../../../crates/cvm-runtime", features = [
   "cosmwasm",
 ], default-features = false }
 prost = { workspace = true, default-features = false }
diff --git a/crates/cw-cvm/.devenv/profile → crates/cvm-runtime/.devenv/profile b/crates/cw-cvm/.devenv/profile → crates/cvm-runtime/.devenv/profile
diff --git a/crates/cw-cvm/Cargo.toml → crates/cvm-runtime/Cargo.toml b/crates/cw-cvm/Cargo.toml → crates/cvm-runtime/Cargo.toml
@@ -2,7 +2,8 @@
 authors = ["Composable Developers"]
 edition = "2021"
 homepage = "https://composable.finance"
-name = "xc-core"
+name = "cvm-runtime"
+description = "CVM runner on various chains"
 version = "0.1.0"
 
 [dependencies]
@@ -44,7 +45,6 @@ xcm = ["dep:xcm"]
 cosmwasm = ["cw-storage-plus", "cw20"]
 substrate = ["xcm"]
 std = [
-  "cosmwasm-std/std",
   "cw-storage-plus/std",
   "dep:cosmwasm-schema",
   "dep:schemars",

diff --git a/crates/cw-cvm/build.rs → crates/cvm-runtime/build.rs b/crates/cw-cvm/build.rs → crates/cvm-runtime/build.rs
diff --git a/crates/cw-cvm/clippy.toml → crates/cvm-runtime/clippy.toml b/crates/cw-cvm/clippy.toml → crates/cvm-runtime/clippy.toml
diff --git a/crates/cw-cvm/proto/SolidityTypes.proto → crates/cvm-runtime/proto/SolidityTypes.proto b/crates/cw-cvm/proto/SolidityTypes.proto → crates/cvm-runtime/proto/SolidityTypes.proto
diff --git a/crates/cw-cvm/proto/common.proto → crates/cvm-runtime/proto/common.proto b/crates/cw-cvm/proto/common.proto → crates/cvm-runtime/proto/common.proto
diff --git a/crates/cw-cvm/proto/program.proto → crates/cvm-runtime/proto/program.proto b/crates/cw-cvm/proto/program.proto → crates/cvm-runtime/proto/program.proto
diff --git a/crates/cw-cvm/src/abstraction.rs → crates/cvm-runtime/src/abstraction.rs b/crates/cw-cvm/src/abstraction.rs → crates/cvm-runtime/src/abstraction.rs
diff --git a/crates/cw-cvm/src/accounts.rs → crates/cvm-runtime/src/accounts.rs b/crates/cw-cvm/src/accounts.rs → crates/cvm-runtime/src/accounts.rs
diff --git a/crates/cw-cvm/src/asset.rs → crates/cvm-runtime/src/asset.rs b/crates/cw-cvm/src/asset.rs → crates/cvm-runtime/src/asset.rs
diff --git a/crates/cw-cvm/src/bin/gateway.rs → crates/cvm-runtime/src/bin/gateway.rs b/crates/cw-cvm/src/bin/gateway.rs → crates/cvm-runtime/src/bin/gateway.rs
diff --git a/crates/cw-cvm/src/bridge.rs → crates/cvm-runtime/src/bridge.rs b/crates/cw-cvm/src/bridge.rs → crates/cvm-runtime/src/bridge.rs
diff --git a/crates/cw-cvm/src/cosmos.rs → crates/cvm-runtime/src/cosmos.rs b/crates/cw-cvm/src/cosmos.rs → crates/cvm-runtime/src/cosmos.rs
diff --git a/crates/cw-cvm/src/cosmwasm/mod.rs → crates/cvm-runtime/src/cosmwasm/mod.rs b/crates/cw-cvm/src/cosmwasm/mod.rs → crates/cvm-runtime/src/cosmwasm/mod.rs
diff --git a/crates/cw-cvm/src/escrow.rs → crates/cvm-runtime/src/escrow.rs b/crates/cw-cvm/src/escrow.rs → crates/cvm-runtime/src/escrow.rs
diff --git a/crates/cw-cvm/src/gateway/config.rs → crates/cvm-runtime/src/gateway/config.rs b/crates/cw-cvm/src/gateway/config.rs → crates/cvm-runtime/src/gateway/config.rs
diff --git a/crates/cw-cvm/src/gateway/mod.rs → crates/cvm-runtime/src/gateway/mod.rs b/crates/cw-cvm/src/gateway/mod.rs → crates/cvm-runtime/src/gateway/mod.rs
diff --git a/crates/cw-cvm/src/gateway/query.rs → crates/cvm-runtime/src/gateway/query.rs b/crates/cw-cvm/src/gateway/query.rs → crates/cvm-runtime/src/gateway/query.rs
diff --git a/crates/cw-cvm/src/instruction.rs → crates/cvm-runtime/src/instruction.rs b/crates/cw-cvm/src/instruction.rs → crates/cvm-runtime/src/instruction.rs
diff --git a/crates/cw-cvm/src/lib.rs → crates/cvm-runtime/src/lib.rs b/crates/cw-cvm/src/lib.rs → crates/cvm-runtime/src/lib.rs
diff --git a/crates/cw-cvm/src/network.rs → crates/cvm-runtime/src/network.rs b/crates/cw-cvm/src/network.rs → crates/cvm-runtime/src/network.rs
diff --git a/crates/cw-cvm/src/packet.rs → crates/cvm-runtime/src/packet.rs b/crates/cw-cvm/src/packet.rs → crates/cvm-runtime/src/packet.rs
diff --git a/crates/cw-cvm/src/prelude.rs → crates/cvm-runtime/src/prelude.rs b/crates/cw-cvm/src/prelude.rs → crates/cvm-runtime/src/prelude.rs
diff --git a/crates/cw-cvm/src/program.rs → crates/cvm-runtime/src/program.rs b/crates/cw-cvm/src/program.rs → crates/cvm-runtime/src/program.rs
diff --git a/crates/cw-cvm/src/proto.rs → crates/cvm-runtime/src/proto.rs b/crates/cw-cvm/src/proto.rs → crates/cvm-runtime/src/proto.rs
diff --git a/crates/cw-cvm/src/proto/common.rs → crates/cvm-runtime/src/proto/common.rs b/crates/cw-cvm/src/proto/common.rs → crates/cvm-runtime/src/proto/common.rs
diff --git a/crates/cw-cvm/src/proto/cvm.rs → crates/cvm-runtime/src/proto/cvm.rs b/crates/cw-cvm/src/proto/cvm.rs → crates/cvm-runtime/src/proto/cvm.rs
diff --git a/crates/cw-cvm/src/proto/pb.rs → crates/cvm-runtime/src/proto/pb.rs b/crates/cw-cvm/src/proto/pb.rs → crates/cvm-runtime/src/proto/pb.rs
diff --git a/crates/cw-cvm/src/proto/result.rs → crates/cvm-runtime/src/proto/result.rs b/crates/cw-cvm/src/proto/result.rs → crates/cvm-runtime/src/proto/result.rs
diff --git a/crates/cw-cvm/src/protocol.rs → crates/cvm-runtime/src/protocol.rs b/crates/cw-cvm/src/protocol.rs → crates/cvm-runtime/src/protocol.rs
diff --git a/crates/cw-cvm/src/service/dex/mod.rs → crates/cvm-runtime/src/service/dex/mod.rs b/crates/cw-cvm/src/service/dex/mod.rs → crates/cvm-runtime/src/service/dex/mod.rs
diff --git a/crates/cw-cvm/src/service/dex/osmosis.rs → ...es/cvm-runtime/src/service/dex/osmosis.rs b/crates/cw-cvm/src/service/dex/osmosis.rs → ...es/cvm-runtime/src/service/dex/osmosis.rs
diff --git a/...cw-cvm/src/service/dex/osmosis_std/mod.rs → ...untime/src/service/dex/osmosis_std/mod.rs b/...cw-cvm/src/service/dex/osmosis_std/mod.rs → ...untime/src/service/dex/osmosis_std/mod.rs
diff --git a/.../src/service/dex/osmosis_std/types/mod.rs → .../src/service/dex/osmosis_std/types/mod.rs b/.../src/service/dex/osmosis_std/types/mod.rs → .../src/service/dex/osmosis_std/types/mod.rs
diff --git a/...vice/dex/osmosis_std/types/osmosis/mod.rs → ...vice/dex/osmosis_std/types/osmosis/mod.rs b/...vice/dex/osmosis_std/types/osmosis/mod.rs → ...vice/dex/osmosis_std/types/osmosis/mod.rs
diff --git a/...osis_std/types/osmosis/poolmanager/mod.rs → ...osis_std/types/osmosis/poolmanager/mod.rs b/...osis_std/types/osmosis/poolmanager/mod.rs → ...osis_std/types/osmosis/poolmanager/mod.rs
diff --git a/..._std/types/osmosis/poolmanager/v1beta1.rs → ..._std/types/osmosis/poolmanager/v1beta1.rs b/..._std/types/osmosis/poolmanager/v1beta1.rs → ..._std/types/osmosis/poolmanager/v1beta1.rs
diff --git a/crates/cw-cvm/src/service/mod.rs → crates/cvm-runtime/src/service/mod.rs b/crates/cw-cvm/src/service/mod.rs → crates/cvm-runtime/src/service/mod.rs
diff --git a/crates/cw-cvm/src/shared.rs → crates/cvm-runtime/src/shared.rs b/crates/cw-cvm/src/shared.rs → crates/cvm-runtime/src/shared.rs
diff --git a/...es/cw-cvm/src/transport/ibc/ics20/hook.rs → ...m-runtime/src/transport/ibc/ics20/hook.rs b/...es/cw-cvm/src/transport/ibc/ics20/hook.rs → ...m-runtime/src/transport/ibc/ics20/hook.rs
diff --git a/crates/cw-cvm/src/transport/ibc/ics20/mod.rs → ...vm-runtime/src/transport/ibc/ics20/mod.rs b/crates/cw-cvm/src/transport/ibc/ics20/mod.rs → ...vm-runtime/src/transport/ibc/ics20/mod.rs
diff --git a/crates/cw-cvm/src/transport/ibc/ics20/pfm.rs → ...vm-runtime/src/transport/ibc/ics20/pfm.rs b/crates/cw-cvm/src/transport/ibc/ics20/pfm.rs → ...vm-runtime/src/transport/ibc/ics20/pfm.rs
diff --git a/crates/cw-cvm/src/transport/ibc/mod.rs → crates/cvm-runtime/src/transport/ibc/mod.rs b/crates/cw-cvm/src/transport/ibc/mod.rs → crates/cvm-runtime/src/transport/ibc/mod.rs
diff --git a/crates/cw-cvm/src/transport/ibc/picasso.rs → .../cvm-runtime/src/transport/ibc/picasso.rs b/crates/cw-cvm/src/transport/ibc/picasso.rs → .../cvm-runtime/src/transport/ibc/picasso.rs
diff --git a/crates/cw-cvm/src/transport/mod.rs → crates/cvm-runtime/src/transport/mod.rs b/crates/cw-cvm/src/transport/mod.rs → crates/cvm-runtime/src/transport/mod.rs
diff --git a/crates/cw-cvm/src/transport/xcm/mod.rs → crates/cvm-runtime/src/transport/xcm/mod.rs b/crates/cw-cvm/src/transport/xcm/mod.rs → crates/cvm-runtime/src/transport/xcm/mod.rs