Align the code to the newRust SDK

Cargo.toml

@@ -1,16 +1,18 @@
 [workspace]
 resolver = "2"
-members = ["src/contract", "src/lib/cdm/rust", "src/lib/cdm/rust-macros"]
+members = ["src/contract", "src/lib/cdm/rust", "src/lib/cdm/rust-macros", "src/lib/cdm/import-test"]
 
 [workspace.package]
 version = "0.1.0"
 authors = ["Parity Technologies"]
 edition = "2024"
+license = "Apache-2.0"
+repository = "https://github.com/paritytech/contract-dependency-manager"
 
 [workspace.dependencies]
-pvm_contract = { git = "https://github.com/paritytech/cargo-pvm-contract", branch = "charles/cdm-integration" }
+pvm-contract-sdk = { git = "https://github.com/paritytech/cargo-pvm-contract", branch = "sm/cdm", features = ["alloc"] }
+pvm-cdm = { path = "src/lib/cdm/rust-macros/pvm-cdm" }
 polkavm-derive = "0.31"
-parity-scale-codec = { version = "3.7", default-features = false, features = ["derive"] }
 picoalloc = "5.2"
 cdm = { path = "src/lib/cdm/rust" }
 cdm-macros = { path = "src/lib/cdm/rust-macros" }
@@ -20,3 +22,4 @@ proc-macro2 = "1"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 home = "0.5"
+keccak-const = "0.2"

README.md

@@ -277,7 +277,12 @@ bun run src/apps/cli/src/cli.ts --help
 make frontend
 
 # Run tests
-make test
+make test                # unit tests only (fast)
+pnpm test:e2e            # end-to-end: spawns revive-dev-node, deploys
+                         # the registry, exercises every method.
+                         # Requires `revive-dev-node` and `bun` on $PATH:
+                         #   cargo install --git https://github.com/paritytech/polkadot-sdk --bin revive-dev-node
+                         #   curl -fsSL https://bun.sh/install | bash
 
 # Build native binary
 make compile

package.json

@@ -8,6 +8,8 @@
     "lint": "turbo lint",
     "clean": "turbo clean",
     "test": "vitest run",
+    "test:e2e:setup": "pnpm --filter @dotdm/utils --filter @dotdm/env --filter @dotdm/contracts build",
+    "test:e2e": "pnpm test:e2e:setup && vitest run --config vitest.e2e.config.ts",
     "format": "biome format --write .",
     "format:check": "biome format ."
   },

src/contract/Cargo.toml

@@ -3,10 +3,15 @@ name = "contract-registry"
 version.workspace = true
 edition.workspace = true
 
+[features]
+abi-gen = ["pvm-contract-sdk/abi-gen"]
+
+[package.metadata.cdm-package]
+name = "@cdm/contract-registry"
+
 [dependencies]
-pvm_contract.workspace = true
+pvm-contract-sdk.workspace = true
 polkavm-derive.workspace = true
-parity-scale-codec.workspace = true
 picoalloc.workspace = true
 
 [lib]