feat: extracting constants to common

packages/contracts/package.json

@@ -37,6 +37,7 @@
     "@meshsdk/core": "1.5.16"
   },
   "dependencies": {
+    "@harmoniclabs/plu-ts": "0.2.2",
     "@meshsdk/mesh-csl": "^0.0.4"
   }
 }

packages/contracts/src/escrow/offchain.ts

@@ -71,7 +71,7 @@ export class MeshEscrowContract extends MeshTxInitiator {
     await this.mesh
       .txOut(scriptAddr, escrowAmount)
       .txOutInlineDatumValue(
-        initiateEscrowDatum(walletAddress, escrowAmount),
+        initiateEscrowDatum(walletAddress, escrowAmount) as any,
         'JSON'
       )
       .changeAddress(walletAddress)
@@ -169,7 +169,7 @@ export class MeshEscrowContract extends MeshTxInitiator {
       )
       .spendingReferenceTxInInlineDatumPresent()
       .txInRedeemerValue(
-        recipientDepositRedeemer(walletAddress, depositAmount),
+        recipientDepositRedeemer(walletAddress, depositAmount) as any,
         {
           mem: 7_000_000,
           steps: 3_000_000_000,
@@ -178,7 +178,7 @@ export class MeshEscrowContract extends MeshTxInitiator {
       )
       .txInScript(this.scriptCbor)
       .txOut(scriptAddr, escrowAmount)
-      .txOutInlineDatumValue(outputDatum, 'JSON')
+      .txOutInlineDatumValue(outputDatum as any, 'JSON')
       .changeAddress(walletAddress)
       .txInCollateral(
         collateral.input.txHash,

packages/contracts/src/marketplace/offchain.ts

@@ -82,7 +82,7 @@ export class MeshMarketplaceContract extends MeshTxInitiator {
 
     await this.mesh
       .txOut(scriptAddr, tokenForSale)
-      .txOutInlineDatumValue(outputDatum, 'JSON')
+      .txOutInlineDatumValue(outputDatum as any, 'JSON')
       .changeAddress(walletAddress)
       .selectUtxosFrom(selectedUtxos)
       .complete();
@@ -219,7 +219,7 @@ export class MeshMarketplaceContract extends MeshTxInitiator {
       .spendingReferenceTxInRedeemerValue(mConStr1([]))
       .txInScript(this.scriptCbor)
       .txOut(scriptAddr, tokenForSale)
-      .txOutInlineDatumValue(outputDatum, 'JSON')
+      .txOutInlineDatumValue(outputDatum as any, 'JSON')
       .changeAddress(walletAddress)
       .requiredSignerHash(serializeBech32Address(walletAddress).pubKeyHash)
       .txInCollateral(

packages/contracts/src/payment-splitter/offchain.ts

@@ -11,6 +11,7 @@ import {
   list,
 } from '@meshsdk/mesh-csl';
 import blueprint from './aiken-workspace/plutus.json';
+import { PlutusScript } from '@meshsdk/common';
 
 export class MeshPaymentSplitterContract extends MeshTxInitiator {
   wrapPayees = (payees: string[]) =>
@@ -49,7 +50,7 @@ export class MeshPaymentSplitterContract extends MeshTxInitiator {
 
     const { walletAddress } = await this.getWalletInfoForTx();
 
-    const script = {
+    const script: PlutusScript = {
       code: this.scriptCbor(),
       version: 'V2',
     };
@@ -83,7 +84,7 @@ export class MeshPaymentSplitterContract extends MeshTxInitiator {
 
     const { walletAddress, collateral } = await this.getWalletInfoForTx();
 
-    const script = {
+    const script: PlutusScript = {
       code: this.scriptCbor(),
       version: 'V2',
     };
@@ -112,7 +113,7 @@ export class MeshPaymentSplitterContract extends MeshTxInitiator {
           value: utxo,
           script: script,
           datum: datum,
-          redeemer: redeemer,
+          redeemer: redeemer as any, // TODO: fix this cast any
         });
       }
     }

packages/demo/components/pages/providers/evaluator/evaluateTx.tsx

@@ -5,6 +5,7 @@ import Card from '../../../ui/card';
 import Codeblock from '../../../ui/codeblock';
 import { Transaction, KoiosProvider, resolveDataHash } from '@meshsdk/core';
 import { useWallet, CardanoWallet } from '@meshsdk/react';
+import { UTxO } from '@meshsdk/common';
 
 export function evaluateTxLeft({ evaluatorName }) {
   let code1 = ``;
@@ -96,14 +97,14 @@ export function evaluateTxRight({ evaluator }) {
 
       const tx = new Transaction({ initiator: wallet })
         .redeemValue({
-          value: assetUtxo,
+          value: assetUtxo as UTxO,
           script: {
             version: 'V1',
             code: '4e4d01000033222220051200120011',
           },
           datum: 'supersecretmeshdemo',
         })
-        .sendValue(address, assetUtxo)
+        .sendValue(address, assetUtxo as UTxO)
         .setRequiredSigners([address]);
 
       const unsignedTx = await tx.build();

packages/demo/package.json

@@ -12,6 +12,7 @@
     "lint": "next lint"
   },
   "dependencies": {
+    "@harmoniclabs/plu-ts": "^0.3.0",
     "@headlessui/react": "^1.6.6",
     "@heroicons/react": "^2.0.10",
     "@meshsdk/contracts": "1.0.0-beta.5",

packages/demo/pages/guides/custom-provider.tsx

@@ -79,7 +79,7 @@ function IntroSection() {
 
 function HowItWorksSection() {
   let codeIFetcher = ``;
-  codeIFetcher += `import type { AccountInfo, AssetMetadata, Protocol, UTxO } from '@mesh/types';\n\n`;
+  codeIFetcher += `import type { AccountInfo, AssetMetadata, Protocol, UTxO } from '@meshsdk/common';\n\n`;
   codeIFetcher += `export interface IFetcher {\n`;
   codeIFetcher += `  fetchAccountInfo(address: string): Promise<AccountInfo>;\n`;
   codeIFetcher += `  fetchAddressUTxOs(address: string, asset?: string): Promise<UTxO[]>;\n`;
@@ -161,7 +161,7 @@ function StarterSection() {
   code += `  AssetMetadata,\n`;
   code += `  Protocol,\n`;
   code += `  UTxO,\n`;
-  code += `} from "@mesh/types";\n`;
+  code += `} from "../common/types";\n`;
   code += `\n`;
   code += `export class NAMEProvider implements IFetcher, ISubmitter {\n`;
   code += `  constructor(network: "") {\n`;

packages/demo/pages/guides/pluts.tsx

@@ -30,7 +30,7 @@ import {
   Transaction,
   BlockfrostProvider,
 } from '@meshsdk/core';
-import type { PlutusScript, Data } from '@meshsdk/common';
+import type { PlutusScript, Data, Redeemer } from '@meshsdk/common';
 import { useWallet } from '@meshsdk/react';
 import { useState } from 'react';
 
@@ -871,7 +871,7 @@ function HelloWorldUnlock() {
             value: utxo,
             script: script,
             datum: utxo,
-            redeemer: redeemer,
+            redeemer: redeemer as any,
           })
           .sendValue(address, utxo)
           .setRequiredSigners([address]);

packages/demo/pages/guides/smart-contract-transactions.tsx

@@ -12,7 +12,7 @@ import {
   resolvePlutusScriptAddress,
   resolveDataHash,
 } from '@meshsdk/core';
-import type { Data, PlutusScript } from '@meshsdk/common';
+import type { Data, PlutusScript, Redeemer } from '@meshsdk/common';
 import { useEffect, useState } from 'react';
 import Button from '../../components/ui/button';
 import RunDemoResult from '../../components/common/runDemoResult';
@@ -919,7 +919,7 @@ const scriptCbor =
 export function useMarketplacePlutus({ blockchainFetcher, network = 0 }) {
   const { connected, wallet } = useWallet();
   const [scriptAddress, setScriptAddress] = useState('');
-  const [script, setScript] = useState({});
+  const [script, setScript] = useState<PlutusScript>();
 
   useEffect(() => {
     const _script: PlutusScript = {
@@ -1035,9 +1035,9 @@ export function useMarketplacePlutus({ blockchainFetcher, network = 0 }) {
       const tx = new Transaction({ initiator: wallet })
         .redeemValue({
           value: assetUtxo,
-          script: script,
+          script: script as PlutusScript,
           datum: datumConstr,
-          redeemer: redeemer,
+          redeemer: redeemer as any, // TODO: Investigate why there is type error without casting any
         })
         .sendValue(addr, assetUtxo)
         .setRequiredSigners([addr]);
@@ -1084,9 +1084,9 @@ export function useMarketplacePlutus({ blockchainFetcher, network = 0 }) {
       const tx = new Transaction({ initiator: wallet })
         .redeemValue({
           value: assetUtxo,
-          script: script,
+          script: script as PlutusScript,
           datum: datumConstr,
-          redeemer: redeemer,
+          redeemer: redeemer as any, // TODO: Investigate why there is type error without casting any
         })
         .sendValue(addr, assetUtxo)
         .sendLovelace(sellerAddr, listPriceInLovelace.toString())
@@ -1143,9 +1143,9 @@ export function useMarketplacePlutus({ blockchainFetcher, network = 0 }) {
       const tx = new Transaction({ initiator: wallet })
         .redeemValue({
           value: assetUtxo,
-          script: script,
+          script: script as PlutusScript,
           datum: datumConstr,
-          redeemer: redeemer,
+          redeemer: redeemer as any, // TODO: Investigate why there is type error without casting any
         })
         .setRequiredSigners([addr])
         .sendAssets(