feat(sdk): expose data contract from json

packages/dapi/package.json

@@ -51,7 +51,7 @@
     "jayson": "^4.1.0",
     "lodash": "^4.17.21",
     "lru-cache": "^5.1.1",
-    "pino": "^8.16.2",
+    "pino": "^9.13.0",
     "pino-pretty": "^10.2.3",
     "ws": "^8.17.1"
   },

packages/dashmate/package.json

@@ -71,7 +71,7 @@
     "chalk": "^4.1.0",
     "cron": "^2.1.0",
     "diskusage-ng": "^1.0.4",
-    "dockerode": "^4.0.5",
+    "dockerode": "^4.0.9",
     "dot": "^1.1.3",
     "dotenv": "^8.6.0",
     "enquirer": "github:dashpay/enquirer#patch-1",

packages/js-evo-sdk/src/contracts/facade.ts

@@ -9,7 +9,7 @@ export class ContractsFacade {
     this.sdk = sdk;
   }
 
-  async fetch(contractId: string): Promise<wasm.DataContractWasm> {
+  async fetch(contractId: string): Promise<wasm.DataContract> {
     const w = await this.sdk.getWasmSdkConnected();
     return w.getDataContract(contractId);
   }

packages/js-evo-sdk/src/sdk.ts

@@ -144,4 +144,4 @@ export { SystemFacade } from './system/facade.js';
 export { GroupFacade } from './group/facade.js';
 export { VotingFacade } from './voting/facade.js';
 export { wallet } from './wallet/functions.js';
-export { verifyIdentityResponse, verifyDataContract, verifyDocuments, start } from './wasm.js';
+export * from './wasm.js';

packages/js-evo-sdk/tests/functional/contracts.spec.mjs

@@ -1,4 +1,4 @@
-import { EvoSDK } from '../../dist/evo-sdk.module.js';
+import { EvoSDK, DataContract } from '../../dist/evo-sdk.module.js';
 import { TEST_IDS } from '../fixtures/testnet.mjs';
 
 describe('Data Contracts', function dataContractsSuite() {
@@ -13,7 +13,7 @@ describe('Data Contracts', function dataContractsSuite() {
 
   it('fetch() returns data contract', async () => {
     const res = await sdk.contracts.fetch(TEST_IDS.dataContractId);
-    expect(res).to.exist();
+    expect(res).to.be.instanceOf(DataContract);
   });
 
   it('fetchWithProof() returns proof info', async () => {

packages/js-evo-sdk/tests/unit/facades/contracts.spec.mjs

@@ -4,15 +4,18 @@ import { EvoSDK } from '../../../dist/sdk.js';
 describe('ContractsFacade', () => {
   let wasmSdk;
   let client;
+  let dataContract;
 
   beforeEach(async function setup() {
     await init();
     const builder = wasmSDKPackage.WasmSdkBuilder.testnetTrusted();
     wasmSdk = builder.build();
     client = EvoSDK.fromWasm(wasmSdk);
 
+    dataContract = Object.create(wasmSDKPackage.DataContract.prototype);
+
     // instance methods used by ContractsFacade
-    this.sinon.stub(wasmSdk, 'getDataContract').resolves(true);
+    this.sinon.stub(wasmSdk, 'getDataContract').resolves(dataContract);
     this.sinon.stub(wasmSdk, 'getDataContractWithProofInfo').resolves(true);
     this.sinon.stub(wasmSdk, 'getDataContractHistory').resolves(true);
     this.sinon.stub(wasmSdk, 'getDataContractHistoryWithProofInfo').resolves(true);
@@ -23,8 +26,9 @@ describe('ContractsFacade', () => {
   });
 
   it('fetch() forwards to instance getDataContract', async () => {
-    await client.contracts.fetch('c');
+    const result = await client.contracts.fetch('c');
     expect(wasmSdk.getDataContract).to.be.calledOnceWithExactly('c');
+    expect(result).to.be.instanceOf(wasmSDKPackage.DataContract);
   });
 
   it('fetchWithProof() forwards to instance getDataContractWithProofInfo', async () => {

packages/wasm-sdk/src/dpp.rs

@@ -294,7 +294,7 @@ impl IdentityWasm {
 //     }
 // }
 
-#[wasm_bindgen]
+#[wasm_bindgen(js_name=DataContract)]
 pub struct DataContractWasm(DataContract);
 
 impl From<DataContract> for DataContractWasm {
@@ -303,12 +303,37 @@ impl From<DataContract> for DataContractWasm {
     }
 }
 
-#[wasm_bindgen]
+#[wasm_bindgen(js_class=DataContract)]
 impl DataContractWasm {
     pub fn id(&self) -> String {
         self.0.id().to_string(Encoding::Base58)
     }
 
+    #[wasm_bindgen(js_name=fromJSON)]
+    pub fn from_json(
+        json: &JsValue,
+        platform_version: u32,
+    ) -> Result<DataContractWasm, WasmSdkError> {
+        let platform_version = &PlatformVersion::get(platform_version).map_err(|e| {
+            WasmSdkError::invalid_argument(format!(
+                "unknown platform version {platform_version}: {e}"
+            ))
+        })?;
+
+        let data_contract = DataContract::from_json(
+            serde_wasm_bindgen::from_value(json.clone()).map_err(|e| {
+                WasmSdkError::serialization(format!("failed to convert json: {}", e))
+            })?,
+            true,
+            platform_version,
+        )
+        .map_err(|e| {
+            WasmSdkError::serialization(format!("failed to create DataContract from json: {}", e))
+        })?;
+
+        Ok(data_contract.into())
+    }
+
     #[wasm_bindgen(js_name=toJSON)]
     pub fn to_json(&self) -> Result<JsValue, WasmSdkError> {
         let platform_version = PlatformVersion::first();

packages/wasm-sdk/tests/unit/data-contract.spec.mjs

@@ -0,0 +1,23 @@
+import init, * as sdk from '../../dist/sdk.compressed.js';
+import contractFixture from './fixtures/data-contract-crypto-card-game.mjs';
+
+const PLATFORM_VERSION = 1;
+
+describe('DataContract', () => {
+  before(async () => {
+    await init();
+  });
+
+  it('should create a contract from JSON and expose identifiers', async () => {
+    const contract = sdk.DataContract.fromJSON(contractFixture, PLATFORM_VERSION);
+
+    expect(contract).to.be.ok();
+    expect(contract.id()).to.equal(contractFixture.id);
+
+    const roundTripped = contract.toJSON();
+    expect(roundTripped).to.be.an('object');
+    expect(roundTripped.id).to.equal(contractFixture.id);
+
+    contract.free();
+  });
+});