-
- npm install @meshsdk/core @meshsdk/react
+
+ npm install @meshsdk/core
{/* */}
diff --git a/packages/config-jest/jest.config.ts b/packages/config-jest/jest.config.ts
index efbea431..9042e9fd 100644
--- a/packages/config-jest/jest.config.ts
+++ b/packages/config-jest/jest.config.ts
@@ -6,21 +6,14 @@ const jestConfig: Config = {
testEnvironment: "node",
testMatch: ["**/packages/**/*.test.ts"],
setupFiles: ["dotenv/config"],
- preset: "ts-jest/presets/default-esm",
+ preset: "ts-jest",
moduleNameMapper: {
"^(\\.{1,2}/.*)\\.js$": "$1",
},
transform: {
- "^.+\\.tsx?$": [
- "ts-jest",
- {
- useESM: true,
- },
- ],
+ "^.+\\.[jt]s?$": "ts-jest",
},
- transformIgnorePatterns: [
- "/node_modules/(?!@meshsdk/core-csl)", // Add exceptions for ESM packages
- ],
+ transformIgnorePatterns: ["/node_modules/(?!@meshsdk/.*)"],
};
export default jestConfig;
diff --git a/packages/mesh-common/test/data/mesh/aliases.test.ts b/packages/mesh-common/test/data/mesh/aliases.test.ts
index c9cb4d3a..fe07568f 100644
--- a/packages/mesh-common/test/data/mesh/aliases.test.ts
+++ b/packages/mesh-common/test/data/mesh/aliases.test.ts
@@ -5,7 +5,8 @@ import {
mTxOutRef,
outputReference,
txOutRef,
-} from "../../../src";
+} from "@meshsdk/common";
+
import { serializeData } from "./common";
const testHash = "baefdc6c5b191be372a794cd8d40d839ec0dbdd3c28957267dc81700";
diff --git a/packages/mesh-common/test/data/mesh/common.ts b/packages/mesh-common/test/data/mesh/common.ts
index b19bbac3..99f6336d 100644
--- a/packages/mesh-common/test/data/mesh/common.ts
+++ b/packages/mesh-common/test/data/mesh/common.ts
@@ -1,7 +1,6 @@
+import { Data } from "@meshsdk/common";
import { castDataToPlutusData } from "@meshsdk/core-csl";
-import { Data } from "../../../src";
-
export const serializeData = (mesh: Data, json: any) => {
const meshData = castDataToPlutusData({
type: "Mesh",
diff --git a/packages/mesh-common/test/data/mesh/constructors.test.ts b/packages/mesh-common/test/data/mesh/constructors.test.ts
index ab2c1820..46ea1350 100644
--- a/packages/mesh-common/test/data/mesh/constructors.test.ts
+++ b/packages/mesh-common/test/data/mesh/constructors.test.ts
@@ -4,12 +4,12 @@ import {
conStr0,
conStr1,
conStr2,
- Data,
mConStr,
mConStr0,
mConStr1,
mConStr2,
-} from "../../../src";
+} from "@meshsdk/common";
+
import { serializeData } from "./common";
const testByteString = "abcd";
diff --git a/packages/mesh-common/test/data/mesh/credentials.test.ts b/packages/mesh-common/test/data/mesh/credentials.test.ts
index 097e393a..72db3cd8 100644
--- a/packages/mesh-common/test/data/mesh/credentials.test.ts
+++ b/packages/mesh-common/test/data/mesh/credentials.test.ts
@@ -1,15 +1,12 @@
import {
- conStr0,
- conStr1,
maybeStakingHash,
mMaybeStakingHash,
mPubKeyAddress,
mScriptAddress,
pubKeyAddress,
- pubKeyHash,
scriptAddress,
- scriptHash,
-} from "../../../src";
+} from "@meshsdk/common";
+
import { serializeData } from "./common";
const testKeyHash1 = "1e4eb194e3335a0dcc4f5c5d009318167c583bb3b0879d9f718cd9e0";
diff --git a/packages/mesh-common/test/data/mesh/primitives.test.ts b/packages/mesh-common/test/data/mesh/primitives.test.ts
index aaebd06b..65e92aa6 100644
--- a/packages/mesh-common/test/data/mesh/primitives.test.ts
+++ b/packages/mesh-common/test/data/mesh/primitives.test.ts
@@ -3,7 +3,8 @@ import {
mBool,
mPlutusBSArrayToString,
mStringToPlutusBSArray,
-} from "../../../src";
+} from "@meshsdk/common";
+
import { serializeData } from "./common";
describe("Plutus data type", () => {
diff --git a/packages/mesh-common/test/data/value.test.ts b/packages/mesh-common/test/data/value.test.ts
index 94d65ab5..82267685 100644
--- a/packages/mesh-common/test/data/value.test.ts
+++ b/packages/mesh-common/test/data/value.test.ts
@@ -9,7 +9,7 @@ import {
parsePlutusValueToAssets,
Value,
value,
-} from "../../src";
+} from "@meshsdk/common";
describe("value", () => {
test("Simple ADA Value", () => {
diff --git a/packages/mesh-core-csl/package.json b/packages/mesh-core-csl/package.json
index d212607d..9edef3e6 100644
--- a/packages/mesh-core-csl/package.json
+++ b/packages/mesh-core-csl/package.json
@@ -20,10 +20,10 @@
"build:mesh": "tsup src/index.ts --format esm,cjs --dts",
"dev": "tsup src/index.ts --format esm,cjs --watch --dts",
"lint": "eslint",
- "test": "jest --verbose",
"clean": "rm -rf .turbo && rm -rf dist && rm -rf node_modules",
"format": "prettier --check . --ignore-path ../../.gitignore",
- "build:docs": "typedoc src/index.ts --json ../../apps/docs/src/data/mesh-core-csl.json"
+ "build:docs": "typedoc src/index.ts --json ../../apps/docs/src/data/mesh-core-csl.json",
+ "test": "jest"
},
"browser": {
"@sidan-lab/sidan-csl-rs-nodejs": "@sidan-lab/sidan-csl-rs-browser"
diff --git a/packages/mesh-core-csl/src/core/serializer.ts b/packages/mesh-core-csl/src/core/serializer.ts
index 97f07c59..f5bc705d 100644
--- a/packages/mesh-core-csl/src/core/serializer.ts
+++ b/packages/mesh-core-csl/src/core/serializer.ts
@@ -43,12 +43,17 @@ import { meshTxBuilderBodyToObj } from "./adaptor";
import { builderDataToCbor } from "./adaptor/data";
export class CSLSerializer implements IMeshTxSerializer {
+ /**
+ * Set to true to enable verbose logging for the txBodyJson prior going into build
+ */
+ verbose: boolean;
protocolParams: Protocol;
meshTxBuilderBody: MeshTxBuilderBody = emptyTxBuilderBody();
- constructor(protocolParams?: Protocol) {
+ constructor(protocolParams?: Protocol, verbose = false) {
this.protocolParams = protocolParams || DEFAULT_PROTOCOL_PARAMETERS;
+ this.verbose = verbose;
}
serializeTxBody(
@@ -59,7 +64,9 @@ export class CSLSerializer implements IMeshTxSerializer {
const params = JSONbig.stringify(protocolParams || this.protocolParams);
- console.log("txBodyJson", txBodyJson);
+ if (this.verbose) {
+ console.log("txBodyJson", txBodyJson);
+ }
const txBuildResult = csl.js_serialize_tx_body(txBodyJson, params);
if (txBuildResult.get_status() !== "success") {
throw new Error(txBuildResult.get_data());
diff --git a/packages/mesh-core-csl/test/core/builder.test.ts b/packages/mesh-core-csl/test/core/builder.test.ts
index 7c02467a..ed1836ca 100644
--- a/packages/mesh-core-csl/test/core/builder.test.ts
+++ b/packages/mesh-core-csl/test/core/builder.test.ts
@@ -3,8 +3,7 @@ import {
DEFAULT_PROTOCOL_PARAMETERS,
MeshTxBuilderBody,
} from "@meshsdk/common";
-
-import { CSLSerializer } from "../../src";
+import { CSLSerializer } from "@meshsdk/core-csl";
describe("Builder", () => {
test("serializeTxBody - send lovelace", () => {
diff --git a/packages/mesh-core-csl/test/utils/address.test.ts b/packages/mesh-core-csl/test/utils/address.test.ts
index fb02f4c5..74c8f6db 100644
--- a/packages/mesh-core-csl/test/utils/address.test.ts
+++ b/packages/mesh-core-csl/test/utils/address.test.ts
@@ -1,10 +1,9 @@
import { pubKeyAddress, scriptAddress } from "@meshsdk/common";
-
import {
deserializeBech32Address,
scriptHashToBech32,
serializeAddressObj,
-} from "../../src";
+} from "@meshsdk/core-csl";
describe("Address", () => {
test("deserializeBech32Address", () => {
diff --git a/packages/mesh-core-csl/test/utils/aiken.test.ts b/packages/mesh-core-csl/test/utils/aiken.test.ts
index a77a39cf..24e89920 100644
--- a/packages/mesh-core-csl/test/utils/aiken.test.ts
+++ b/packages/mesh-core-csl/test/utils/aiken.test.ts
@@ -1,6 +1,8 @@
import { builtinByteString } from "@meshsdk/common";
-
-import { applyParamsToScript, deserializeBech32Address } from "../../src";
+import {
+ applyParamsToScript,
+ deserializeBech32Address,
+} from "@meshsdk/core-csl";
describe("Aiken", () => {
test("applyParamsToScript 1", () => {
diff --git a/packages/mesh-core-csl/test/utils/scripts.test.ts b/packages/mesh-core-csl/test/utils/scripts.test.ts
index fe26894a..7204d523 100644
--- a/packages/mesh-core-csl/test/utils/scripts.test.ts
+++ b/packages/mesh-core-csl/test/utils/scripts.test.ts
@@ -1,4 +1,4 @@
-import { applyParamsToScript, getV2ScriptHash } from "../../src";
+import { applyParamsToScript, getV2ScriptHash } from "@meshsdk/core-csl";
describe("Scripts", () => {
test("getV2ScriptHash", () => {
diff --git a/packages/mesh-core-csl/test/utils/transaction.test.ts b/packages/mesh-core-csl/test/utils/transaction.test.ts
index a377425d..f121b41b 100644
--- a/packages/mesh-core-csl/test/utils/transaction.test.ts
+++ b/packages/mesh-core-csl/test/utils/transaction.test.ts
@@ -1,4 +1,4 @@
-import { calculateTxHash } from "../../src";
+import { calculateTxHash } from "@meshsdk/core-csl";
describe("Transaction", () => {
test("calculateTxHash", () => {
diff --git a/packages/mesh-core-cst/package.json b/packages/mesh-core-cst/package.json
index 3f816be1..a2cf110a 100644
--- a/packages/mesh-core-cst/package.json
+++ b/packages/mesh-core-cst/package.json
@@ -20,7 +20,7 @@
"build:mesh": "tsup src/index.ts --format esm,cjs --dts --minify",
"dev": "tsup src/index.ts --format esm,cjs --watch --dts",
"lint": "eslint",
- "test": "jest --verbose",
+ "test": "jest",
"clean": "rm -rf .turbo && rm -rf dist && rm -rf node_modules",
"format": "prettier --check . --ignore-path ../../.gitignore"
},
diff --git a/packages/mesh-core-cst/src/stricahq/index.ts b/packages/mesh-core-cst/src/stricahq/index.ts
index b9910e05..7d5a7cb7 100644
--- a/packages/mesh-core-cst/src/stricahq/index.ts
+++ b/packages/mesh-core-cst/src/stricahq/index.ts
@@ -1,17 +1,4 @@
-import strica from "@stricahq/bip32ed25519"; // This works with broswer, but not node
-
-// import * as strica from "@stricahq/bip32ed25519"; // This works with node, but not browser
-
-// let strica: any;
-
-// if (typeof window !== "undefined") {
-// // Browser environment
-// strica = await import("@stricahq/bip32ed25519");
-// } else {
-// // Node.js environment
-// strica = require("@stricahq/bip32ed25519");
-// }
-
+import strica from "@stricahq/bip32ed25519";
import hash from "hash.js";
class PrivateKey extends strica.PrivateKey {
diff --git a/packages/mesh-core-cst/test/resolvers.test.ts b/packages/mesh-core-cst/test/resolvers.test.ts
index 94ab149b..115aef10 100644
--- a/packages/mesh-core-cst/test/resolvers.test.ts
+++ b/packages/mesh-core-cst/test/resolvers.test.ts
@@ -3,7 +3,6 @@ import {
PlutusScript,
resolveFingerprint,
} from "@meshsdk/common";
-
import {
resolveDataHash,
resolveNativeScriptAddress,
@@ -11,10 +10,9 @@ import {
resolvePaymentKeyHash,
resolvePlutusScriptAddress,
resolvePlutusScriptHash,
- resolvePrivateKey,
resolveRewardAddress,
resolveStakeKeyHash,
-} from "../src";
+} from "@meshsdk/core-cst";
describe("resolveDataHash", () => {
it("should return correct data", () => {
diff --git a/packages/mesh-core-cst/test/utils/converter.test.ts b/packages/mesh-core-cst/test/utils/converter.test.ts
index bb57e248..076e83f4 100644
--- a/packages/mesh-core-cst/test/utils/converter.test.ts
+++ b/packages/mesh-core-cst/test/utils/converter.test.ts
@@ -1,6 +1,5 @@
import { PlutusScript } from "@meshsdk/common";
-
-import { fromScriptRef } from "../../src/utils/converter";
+import { fromScriptRef } from "@meshsdk/core-cst";
describe("fromScriptRef", () => {
// it("with native script cbor should return correct NativeScript", () => {});
diff --git a/.env.example b/packages/mesh-provider/.env.example
similarity index 100%
rename from .env.example
rename to packages/mesh-provider/.env.example
diff --git a/packages/mesh-provider/package.json b/packages/mesh-provider/package.json
index e244c407..244ee2af 100644
--- a/packages/mesh-provider/package.json
+++ b/packages/mesh-provider/package.json
@@ -21,7 +21,7 @@
"dev": "tsup src/index.ts --format esm,cjs --watch --dts",
"lint": "eslint",
"clean": "rm -rf .turbo && rm -rf dist && rm -rf node_modules",
- "test": "jest --verbose",
+ "test": "jest",
"format": "prettier --check . --ignore-path ../../.gitignore",
"build:docs": "typedoc src/index.ts --json ../../apps/docs/src/data/mesh-providers.json"
},
diff --git a/packages/mesh-provider/test/blockfrost/evaluator.test.ts b/packages/mesh-provider/test/blockfrost/evaluator.test.ts
index 2a9f6893..3322eb8f 100644
--- a/packages/mesh-provider/test/blockfrost/evaluator.test.ts
+++ b/packages/mesh-provider/test/blockfrost/evaluator.test.ts
@@ -1,6 +1,6 @@
import dotenv from "dotenv";
-import { BlockfrostProvider } from "../../src";
+import { BlockfrostProvider } from "@meshsdk/provider";
dotenv.config();
const apiKey = process.env.BLOCKFROST_API_KEY_PREPROD!;
diff --git a/packages/mesh-provider/test/maestro/evaluator.test.ts b/packages/mesh-provider/test/maestro/evaluator.test.ts
index d3cba2a1..7a92933a 100644
--- a/packages/mesh-provider/test/maestro/evaluator.test.ts
+++ b/packages/mesh-provider/test/maestro/evaluator.test.ts
@@ -1,6 +1,6 @@
import dotenv from "dotenv";
-import { MaestroProvider } from "../../src/maestro";
+import { MaestroProvider } from "@meshsdk/provider";
dotenv.config();
const apiKey = process.env.MAESTRO_API_KEY!;
diff --git a/packages/mesh-wallet/package.json b/packages/mesh-wallet/package.json
index d2a45f08..569239dd 100644
--- a/packages/mesh-wallet/package.json
+++ b/packages/mesh-wallet/package.json
@@ -21,7 +21,7 @@
"dev": "tsup src/index.ts --format esm,cjs --watch --dts",
"lint": "eslint",
"clean": "rm -rf .turbo && rm -rf dist && rm -rf node_modules",
- "test": "jest --verbose",
+ "test": "jest",
"format": "prettier --check . --ignore-path ../../.gitignore",
"build:docs": "typedoc src/index.ts --json ../../apps/docs/src/data/mesh-wallets.json"
},
diff --git a/packages/mesh-wallet/test/app.test.ts b/packages/mesh-wallet/test/app.test.ts
index fed9c007..02c6730f 100644
--- a/packages/mesh-wallet/test/app.test.ts
+++ b/packages/mesh-wallet/test/app.test.ts
@@ -1,4 +1,4 @@
-import { AppWallet } from "../src";
+import { AppWallet } from "@meshsdk/wallet";
describe("AppWallet", () => {
const wallet = new AppWallet({
diff --git a/packages/mesh-wallet/test/browser.test.ts b/packages/mesh-wallet/test/browser.test.ts
index ac7d6f9c..e2db9b52 100644
--- a/packages/mesh-wallet/test/browser.test.ts
+++ b/packages/mesh-wallet/test/browser.test.ts
@@ -1,6 +1,5 @@
import { CardanoSDKUtil, Serialization } from "@meshsdk/core-cst";
-
-import { WalletStaticMethods } from "../src";
+import { WalletStaticMethods } from "@meshsdk/wallet";
describe("BroswerWallet", () => {
it("signTx: addWitnessSet", () => {
diff --git a/packages/mesh-wallet/test/embedded.test.ts b/packages/mesh-wallet/test/embedded.test.ts
index 7c95132e..9b0e84c2 100644
--- a/packages/mesh-wallet/test/embedded.test.ts
+++ b/packages/mesh-wallet/test/embedded.test.ts
@@ -1,6 +1,5 @@
import { checkSignature } from "@meshsdk/core-cst";
-
-import { EmbeddedWallet } from "../src";
+import { EmbeddedWallet } from "@meshsdk/wallet";
describe("EmbeddedWallet mnemonic", () => {
const wallet = new EmbeddedWallet({
diff --git a/packages/mesh-wallet/test/mesh.test.ts b/packages/mesh-wallet/test/mesh.test.ts
index 7b78638c..0b3bbf20 100644
--- a/packages/mesh-wallet/test/mesh.test.ts
+++ b/packages/mesh-wallet/test/mesh.test.ts
@@ -1,4 +1,4 @@
-import { MeshWallet } from "../src";
+import { MeshWallet } from "@meshsdk/wallet";
describe("MeshWallet", () => {
const wallet = new MeshWallet({
From a8dc534c1a144b77a7600e413b16dc18cfec1bae Mon Sep 17 00:00:00 2001
From: SIDANPillow
Date: Sat, 3 Aug 2024 11:23:45 +0800
Subject: [PATCH 02/17] feat:update value implementation
---
packages/mesh-common/src/data/value.ts | 182 +++++++++++++++++++++++++
1 file changed, 182 insertions(+)
diff --git a/packages/mesh-common/src/data/value.ts b/packages/mesh-common/src/data/value.ts
index f88b7089..5599af87 100644
--- a/packages/mesh-common/src/data/value.ts
+++ b/packages/mesh-common/src/data/value.ts
@@ -68,3 +68,185 @@ export const parsePlutusValueToAssets = (plutusValue: Value): Asset[] => {
return assets;
};
+
+export class MMValue {
+ value: Record;
+
+ constructor() {
+ this.value = {};
+ }
+
+ /**
+ * Add an asset to the Value class's value record. If an asset with the same unit already exists in the value record, the quantity of the
+ * existing asset will be increased by the quantity of the new asset. If no such asset exists, the new asset will be added to the value record.
+ * Implementation:
+ * 1. Check if the unit of the asset already exists in the value record.
+ * 2. If the unit exists, add the new quantity to the existing quantity.
+ * 3. If the unit does not exist, add the unti to the object.
+ * 4. Return the Value class instance.
+ * @param asset
+ * @returns this
+ */
+ addAsset = (asset: Asset): this => {
+ const quantity = BigInt(asset.quantity);
+ const { unit } = asset;
+
+ if (this.value[unit]) {
+ this.value[unit] += quantity;
+ } else {
+ this.value[unit] = quantity;
+ }
+ return this;
+ };
+
+ /**
+ * Add an array of assets to the Value class's value record. If an asset with the same unit already exists in the value record, the quantity of the
+ * existing asset will be increased by the quantity of the new asset. If no such asset exists, the new assets under the array of assets will be added to the value record.
+ * Implementation:
+ * 1. Iterate over each asset in the 'assets' array.
+ * 2. For each asset, check if the unit of the asset already exists in the value record.
+ * 3. If the unit exists, add the new quantity to the existing quantity.
+ * 4. If the unit does not exist, add the unti to the object.
+ * 5. Return the Value class instance.
+ * @param assets
+ * @returns this
+ */
+ addAssets = (assets: Asset[]): this => {
+ assets.forEach((asset) => {
+ this.addAsset(asset);
+ });
+ return this;
+ };
+
+ /**
+ * Substract an asset from the Value class's value record. If an asset with the same unit already exists in the value record, the quantity of the
+ * existing asset will be decreased by the quantity of the new asset. If no such asset exists, an error message should be printed.
+ * Implementation:
+ * 1. Check if the unit of the asset already exists in the value record.
+ * 2. If the unit exists, subtract the new quantity from the existing quantity.
+ * 3. If the unit does not exist, print an error message.
+ * @param asset
+ * @returns this
+ */
+ negateAsset = (asset: Asset): this => {
+ const { unit, quantity } = asset;
+
+ const currentQuantity = this.value[unit] || BigInt(0);
+ const newQuantity = currentQuantity - BigInt(quantity);
+
+ if (newQuantity === BigInt(0)) {
+ delete this.value[unit];
+ } else {
+ this.value[unit] = newQuantity;
+ }
+ return this;
+ };
+
+ /**
+ * Subtract an array of assets from the Value class's value record. If an asset with the same unit already exists in the value record, the quantity of the
+ * existing asset will be decreased by the quantity of the new asset. If no such asset exists, an error message should be printed.
+ * @param assets
+ * @returns this
+ */
+ negateAssets = (assets: Asset[]): this => {
+ assets.forEach((asset) => {
+ this.negateAsset(asset);
+ });
+ return this;
+ };
+
+ /**
+ * Get the quantity of asset object per unit
+ * @param unit
+ * @returns
+ */
+ get = (unit: string): bigint => {
+ return this.value[unit] ? BigInt(this.value[unit]) : BigInt(0);
+ };
+
+ /**
+ * Get all assets (return Record of Asset[])
+ * @param
+ * @returns Record
+ */
+ units = (): Record => {
+ const result: Record = {};
+ Object.keys(this.value).forEach((unit) => {
+ if (!result[unit]) {
+ result[unit] = [];
+ }
+ result[unit].push({ unit, quantity: BigInt(this.value[unit]) });
+ });
+ return result;
+ };
+
+ /**
+ * Check if the value is greater than or equal to an inputted value
+ * @param unit - The unit to compare (e.g., "ADA")
+ * @param other - The value to compare against
+ * @returns boolean
+ */
+ // geq = (unit: string, other: Value): boolean => {
+ // const thisValue = this.get(unit);
+ // const otherValue = other.get(unit);
+ // return thisValue >= otherValue;
+ // };
+
+ geq = (unit: string, other: Value): boolean => {
+ if (this.value[unit] === undefined || other.value[unit] === undefined) {
+ return false;
+ }
+ return BigInt(this.value[unit]) >= BigInt(other.value[unit]);
+ };
+
+ /**
+ * Check if the value is less than or equal to an inputted value
+ * @param unit - The unit to compare (e.g., "ADA")
+ * @param other - The value to compare against
+ * @returns boolean
+ */
+ // leq = (unit: string, other: Value): boolean => {
+ // const thisValue = this.get(unit);
+ // const otherValue = other.get(unit);
+ // if (otherValue === undefined) {
+ // return false;
+ // }
+
+ // return thisValue <= otherValue;
+ // };
+
+ leq = (unit: string, other: Value): boolean => {
+ if (this.value[unit] === undefined || other.value[unit] === undefined) {
+ return false;
+ }
+ return BigInt(this.value[unit]) <= BigInt(other.value[unit]);
+ };
+
+ /**
+ * Check if the value is empty
+ * @param
+ * @returns boolean
+ */
+ isEmpty = (): boolean => {
+ return Object.keys(this.value).length === 0;
+ };
+
+ /**
+ * Merge the given values
+ * @param values
+ * @returns this
+ */
+ merge = (values: Value | Value[]): this => {
+ const valuesArray = Array.isArray(values) ? values : [values];
+
+ valuesArray.forEach((other) => {
+ Object.entries(other.value).forEach(([key, value]) => {
+ this.value[key] =
+ (this.value[key] !== undefined ? BigInt(this.value[key]) : BigInt(0)) +
+ BigInt(value);
+ });
+ });
+
+ return this;
+ };
+}
\ No newline at end of file
From c0fbb2f5592b8e24032be02671f36ae19055450d Mon Sep 17 00:00:00 2001
From: SIDANWhatever
Date: Sat, 3 Aug 2024 11:27:10 +0800
Subject: [PATCH 03/17] wip
---
apps/playground/src/data/links-api.ts | 4 +-
.../pages/apis/txbuilder/minting/index.tsx | 2 +
.../minting/minting-royalty-token.tsx | 188 ++++++++++++++++++
.../src/utils/asset-fingerprint.ts | 2 +-
.../mesh-transaction/src/transaction/index.ts | 130 ++++++++----
5 files changed, 288 insertions(+), 38 deletions(-)
create mode 100644 apps/playground/src/pages/apis/txbuilder/minting/minting-royalty-token.tsx
diff --git a/apps/playground/src/data/links-api.ts b/apps/playground/src/data/links-api.ts
index b0975b52..35c0fabd 100644
--- a/apps/playground/src/data/links-api.ts
+++ b/apps/playground/src/data/links-api.ts
@@ -3,14 +3,14 @@ import { metaData } from "./links-data";
import { metaProviders } from "./links-providers";
import { metaReact } from "./links-react";
import { metaTransaction } from "./links-transactions";
-// import { metaTxbuilder } from "./links-txbuilders";
+import { metaTxbuilder } from "./links-txbuilders";
import { metaUtilities } from "./links-utilities";
import { metaWallets } from "./links-wallets";
export const linksApi: MenuItem[] = [
metaWallets,
metaTransaction,
- // metaTxbuilder, // todo, work on txbuilder docs
+ metaTxbuilder, // todo, work on txbuilder docs
metaData,
metaReact,
metaProviders,
diff --git a/apps/playground/src/pages/apis/txbuilder/minting/index.tsx b/apps/playground/src/pages/apis/txbuilder/minting/index.tsx
index 30339ac0..a07c4acb 100644
--- a/apps/playground/src/pages/apis/txbuilder/minting/index.tsx
+++ b/apps/playground/src/pages/apis/txbuilder/minting/index.tsx
@@ -9,6 +9,7 @@ import TxbuilderMintingCip68 from "./minting-cip68";
import TxbuilderMintingNativeScript from "./minting-native-script";
import TxbuilderMintAsset from "./minting-one-signature";
import TxbuilderMintingPlutusScript from "./minting-plutus-script";
+import TxbuilderMintingRoyaltyToken from "./minting-royalty-token";
const ReactPage: NextPage = () => {
const sidebarItems = [
@@ -42,6 +43,7 @@ const ReactPage: NextPage = () => {
+
>
);
diff --git a/apps/playground/src/pages/apis/txbuilder/minting/minting-royalty-token.tsx b/apps/playground/src/pages/apis/txbuilder/minting/minting-royalty-token.tsx
new file mode 100644
index 00000000..30a2ac88
--- /dev/null
+++ b/apps/playground/src/pages/apis/txbuilder/minting/minting-royalty-token.tsx
@@ -0,0 +1,188 @@
+import { useState } from "react";
+import Link from "next/link";
+
+import {
+ ForgeScript,
+ MeshTxBuilder,
+ Mint,
+ resolveScriptHash,
+ RoyaltiesStandard,
+ Transaction,
+} from "@meshsdk/core";
+import { useWallet } from "@meshsdk/react";
+
+import Input from "~/components/form/input";
+import InputTable from "~/components/sections/input-table";
+import LiveCodeDemo from "~/components/sections/live-code-demo";
+import TwoColumnsScroll from "~/components/sections/two-columns-scroll";
+import Codeblock from "~/components/text/codeblock";
+import { demoAddresses } from "~/data/cardano";
+
+export default function MintingRoyaltyToken() {
+ return (
+
+ );
+}
+
+function Left() {
+ let codeSnippet = ``;
+ codeSnippet += `const usedAddress = await wallet.getUsedAddresses();\n`;
+ codeSnippet += `const address = usedAddress[0];\n`;
+ codeSnippet += `\n`;
+ codeSnippet += `// create forgingScript, you can also use native script here\n`;
+ codeSnippet += `const forgingScript = ForgeScript.withOneSignature(address);\n`;
+ codeSnippet += `\n`;
+ codeSnippet += `const tx = new Transaction({ initiator: wallet });\n`;
+ codeSnippet += `\n`;
+ codeSnippet += `const _assetMetadata = {\n`;
+ codeSnippet += ` rate: '0.2',\n`;
+ codeSnippet += ` addr: '${demoAddresses.testnet}'\n`;
+ codeSnippet += `};\n`;
+ codeSnippet += `const asset: Mint = {\n`;
+ codeSnippet += ` assetName: '',\n`;
+ codeSnippet += ` assetQuantity: '1',\n`;
+ codeSnippet += ` metadata: _assetMetadata,\n`;
+ codeSnippet += ` label: '777',\n`;
+ codeSnippet += ` recipient: address,\n`;
+ codeSnippet += `};\n`;
+ codeSnippet += `\n`;
+ codeSnippet += `tx.mintAsset(forgingScript, asset);\n`;
+ codeSnippet += `\n`;
+ codeSnippet += `const unsignedTx = await tx.build();\n`;
+ codeSnippet += `const signedTx = await wallet.signTx(unsignedTx);\n`;
+ codeSnippet += `const txHash = await wallet.submitTx(signedTx);\n`;
+
+ return (
+ <>
+
+ Royalty tokens is a special type of token that allows the creator to
+ collect a royalty fee, this proposed standard will allow for uniform
+ royalties' distributions across the secondary market space. Read{" "}
+
+ CIP-27
+ {" "}
+ for more information.
+
+
+ The implementation of royalty tokens is very simple, minting a token
+ with 777 label, with "rate" and "addr" in the metadata.
+
+
+
Here is the full code:
+
+ >
+ );
+}
+
+function Right() {
+ const { wallet, connected } = useWallet();
+ const [userInput, setUserInput] = useState("0.2");
+ const [userInput2, setUserInput2] = useState(demoAddresses.testnet);
+
+ async function runDemo() {
+ const utxos = await wallet.getUtxos();
+ const usedAddress = await wallet.getUsedAddresses();
+ const address = usedAddress[0];
+
+ if (address === undefined) {
+ throw "No address found";
+ }
+
+ const forgingScript = ForgeScript.withOneSignature(address);
+ const policyId = resolveScriptHash(forgingScript);
+
+ const assetMetadata: RoyaltiesStandard = {
+ rate: userInput,
+ address: userInput2,
+ };
+
+ const metadata = { [policyId]: { [""]: { ...assetMetadata } } };
+
+ const txBuilder = new MeshTxBuilder();
+
+ const unsignedTx = await txBuilder
+ .mint("1", policyId, "")
+ .mintingScript(forgingScript)
+ .metadataValue("777", metadata)
+ .changeAddress(address)
+ .selectUtxosFrom(utxos)
+ .complete();
+
+ const signedTx = await wallet.signTx(unsignedTx);
+ const txHash = await wallet.submitTx(signedTx);
+
+ return txHash;
+ }
+
+ let code = ``;
+ code += `const usedAddress = await wallet.getUsedAddresses();\n`;
+ code += `const address = usedAddress[0];\n`;
+ code += `\n`;
+ code += `const forgingScript = ForgeScript.withOneSignature(address);\n`;
+ code += `\n`;
+ code += `const tx = new Transaction({ initiator: wallet });\n`;
+ code += `\n`;
+ code += `const _assetMetadata: RoyaltiesStandard = {\n`;
+ code += ` rate: '${userInput}',\n`;
+ code += ` address: '${userInput2}',\n`;
+ code += `};\n`;
+ code += `const asset: Mint = {\n`;
+ code += ` assetName: "",\n`;
+ code += ` assetQuantity: "1",\n`;
+ code += ` metadata: _assetMetadata,\n`;
+ code += ` label: "777",\n`;
+ code += ` recipient: address,\n`;
+ code += `};\n`;
+ code += `\n`;
+ code += `tx.mintAsset(forgingScript, asset);\n`;
+ code += `\n`;
+ code += `const unsignedTx = await tx.build();\n`;
+ code += `const signedTx = await wallet.signTx(unsignedTx);\n`;
+ code += `const txHash = await wallet.submitTx(signedTx);\n`;
+
+ return (
+
+ setUserInput(e.target.value)}
+ placeholder="Rate"
+ label="Rate"
+ key={0}
+ />,
+ ]}
+ />
+ setUserInput2(e.target.value)}
+ placeholder="Address"
+ label="Address"
+ key={1}
+ />,
+ ]}
+ />
+
+ );
+}
diff --git a/packages/mesh-common/src/utils/asset-fingerprint.ts b/packages/mesh-common/src/utils/asset-fingerprint.ts
index 2a8e353c..49861be7 100644
--- a/packages/mesh-common/src/utils/asset-fingerprint.ts
+++ b/packages/mesh-common/src/utils/asset-fingerprint.ts
@@ -5,7 +5,7 @@ import { toBytes } from "../data";
export const AssetFingerprint = CIP14;
export const resolveFingerprint = (policyId: string, assetName: string) => {
- return (AssetFingerprint as any).default
+ return (AssetFingerprint as any).default // todo: check the behaviour
.fromParts(toBytes(policyId), toBytes(assetName))
.fingerprint();
};
diff --git a/packages/mesh-transaction/src/transaction/index.ts b/packages/mesh-transaction/src/transaction/index.ts
index 0113311c..883b5675 100644
--- a/packages/mesh-transaction/src/transaction/index.ts
+++ b/packages/mesh-transaction/src/transaction/index.ts
@@ -1,37 +1,40 @@
import {
Action,
Asset,
+ AssetMetadata,
Budget,
CIP68_100,
CIP68_222,
- DEFAULT_REDEEMER_BUDGET,
Data,
+ DEFAULT_REDEEMER_BUDGET,
+ hexToString,
IInitiator,
+ metadataToCip68,
Mint,
NativeScript,
- POLICY_ID_LENGTH,
PlutusScript,
+ POLICY_ID_LENGTH,
PoolParams,
Recipient,
+ stringToHex,
SUPPORTED_TOKENS,
Token,
UTxO,
- hexToString,
- metadataToCip68,
- stringToHex,
} from "@meshsdk/common";
-import { MeshTxBuilder, MeshTxBuilderOptions } from "../mesh-tx-builder";
import {
deserializeNativeScript,
deserializePlutusScript,
fromScriptRef,
} from "@meshsdk/core-cst";
+import { MeshTxBuilder, MeshTxBuilderOptions } from "../mesh-tx-builder";
+
export interface TransactionOptions extends MeshTxBuilderOptions {
initiator: IInitiator;
}
export class Transaction {
+ private mints: Mint[] = [];
txBuilder: MeshTxBuilder;
initiator: IInitiator;
isCollateralNeeded: boolean = false;
@@ -145,7 +148,7 @@ export class Transaction {
input.input.txHash,
input.input.outputIndex,
input.output.amount,
- input.output.address
+ input.output.address,
);
});
@@ -162,7 +165,7 @@ export class Transaction {
inputs.forEach((input) => {
this.txBuilder.readOnlyTxInReference(
input.input.txHash,
- input.input.outputIndex
+ input.input.outputIndex,
);
});
@@ -178,14 +181,14 @@ export class Transaction {
setNativeScriptInput(script: NativeScript, utxo: UTxO): Transaction {
const { scriptCbor } =
this.txBuilder.serializer.deserializer.script.deserializeNativeScript(
- script
+ script,
);
this.txBuilder
.txIn(
utxo.input.txHash,
utxo.input.outputIndex,
utxo.output.amount,
- utxo.output.address
+ utxo.output.address,
)
.txInScript(scriptCbor!);
@@ -213,7 +216,7 @@ export class Transaction {
value.input.txHash,
value.input.outputIndex,
value.output.amount,
- value.output.address
+ value.output.address,
)
.txInScript(script.code)
.txInRedeemerValue(red.data, "Mesh", red.budget);
@@ -235,12 +238,12 @@ export class Transaction {
value.input.txHash,
value.input.outputIndex,
value.output.amount,
- value.output.address
+ value.output.address,
)
.spendingTxInReference(
script.input.txHash,
script.input.outputIndex,
- script.output.scriptHash
+ script.output.scriptHash,
)
.txInRedeemerValue(red.data, "Mesh", red.budget);
}
@@ -267,7 +270,7 @@ export class Transaction {
mintAsset(
forgeScript: string | PlutusScript | UTxO,
mint: Mint,
- redeemer?: Pick & { budget?: Budget }
+ redeemer?: Pick & { budget?: Budget },
): Transaction {
const assetQuantity = mint.assetQuantity;
let assetNameHex = stringToHex(mint.assetName);
@@ -293,13 +296,13 @@ export class Transaction {
case "object":
if (!redeemer)
throw new Error(
- "burnAsset: Redeemer data is required for Plutus minting"
+ "burnAsset: Redeemer data is required for Plutus minting",
);
if ("code" in forgeScript) {
// Burn plutus script assets with provided script
policyId = deserializePlutusScript(
forgeScript.code,
- forgeScript.version
+ forgeScript.version,
)
.hash()
.toString();
@@ -337,7 +340,7 @@ export class Transaction {
.mint(assetQuantity, policyId, assetNameHex)
.mintTxInReference(
forgeScript.input.txHash,
- forgeScript.input.outputIndex
+ forgeScript.input.outputIndex,
)
.mintRedeemerValue(redeemer.data, "Mesh", redeemer.budget);
if (mint.cip68ScriptAddress) {
@@ -345,7 +348,7 @@ export class Transaction {
.mint(assetQuantity, policyId, referenceAssetNameHex)
.mintTxInReference(
forgeScript.input.txHash,
- forgeScript.input.outputIndex
+ forgeScript.input.outputIndex,
)
.mintRedeemerValue(redeemer.data, "Mesh", redeemer.budget);
break;
@@ -355,7 +358,7 @@ export class Transaction {
} else {
// TODO: to implement reference script minting for native script tokens
throw new Error(
- "mintAsset: Reference script minting not implemented"
+ "mintAsset: Reference script minting not implemented",
);
// this.txBuilder
// .mint(assetQuantity, policyId, assetName)
@@ -368,14 +371,6 @@ export class Transaction {
break;
}
- if (mint.metadata && mint.label) {
- this.setMetadata(Number(mint.label), {
- [policyId]: {
- [mint.assetName]: mint.metadata,
- },
- version: 1,
- });
- }
if (mint.recipient) {
this.sendAssets(mint.recipient, [
{ unit: policyId + assetNameHex, quantity: mint.assetQuantity },
@@ -392,9 +387,12 @@ export class Transaction {
unit: policyId + referenceAssetNameHex,
quantity: mint.assetQuantity,
},
- ]
+ ],
);
}
+ if (!mint.cip68ScriptAddress && mint.metadata && mint.label) {
+ this.mints.push(mint);
+ }
return this;
}
@@ -404,7 +402,7 @@ export class Transaction {
burnAsset(
forgeScript: string | PlutusScript | UTxO,
asset: Asset,
- redeemer?: Pick & { budget?: Budget }
+ redeemer?: Pick & { budget?: Budget },
): Transaction {
const assetQuantity = "-" + asset.quantity;
const mint: Mint = {
@@ -443,7 +441,7 @@ export class Transaction {
collateralUtxo.input.txHash,
collateralUtxo.input.outputIndex,
collateralUtxo.output.amount,
- collateralUtxo.output.address
+ collateralUtxo.output.address,
);
});
@@ -511,23 +509,27 @@ export class Transaction {
delegateStake(rewardAddress: string, poolId: string): Transaction {
this.txBuilder.delegateStakeCertificate(
this.txBuilder.serializer.resolver.keys.resolveStakeKeyHash(
- rewardAddress
+ rewardAddress,
),
- this.txBuilder.serializer.resolver.keys.resolveEd25519KeyHash(poolId)
+ this.txBuilder.serializer.resolver.keys.resolveEd25519KeyHash(poolId),
);
return this;
}
deregisterStake(rewardAddress: string): Transaction {
this.txBuilder.deregisterStakeCertificate(
- this.txBuilder.serializer.resolver.keys.resolveStakeKeyHash(rewardAddress)
+ this.txBuilder.serializer.resolver.keys.resolveStakeKeyHash(
+ rewardAddress,
+ ),
);
return this;
}
registerStake(rewardAddress: string): Transaction {
this.txBuilder.registerStakeCertificate(
- this.txBuilder.serializer.resolver.keys.resolveStakeKeyHash(rewardAddress)
+ this.txBuilder.serializer.resolver.keys.resolveStakeKeyHash(
+ rewardAddress,
+ ),
);
return this;
}
@@ -549,11 +551,12 @@ export class Transaction {
await this.addCollateralIfNeeded();
await this.addTxInputsAsNeeded();
await this.addChangeAddress();
+ this.addMintMetadata();
return this.txBuilder.complete();
} catch (error) {
throw new Error(
- `[Transaction] An error occurred during build: ${error}.`
+ `[Transaction] An error occurred during build: ${error}.`,
);
}
}
@@ -588,6 +591,63 @@ export class Transaction {
return this.txBuilder;
}
+ protected addMintMetadata() {
+ // type Mintdata = { unit: string; data: Mint };
+ // type Metadata = Record>;
+ // const forge = (mint: Mintdata, meta?: Metadata): Metadata => {
+ // const name = mint.data.assetName;
+ // const metadata = mint.data.metadata;
+ // const collection = mint.unit.slice(0, POLICY_ID_LENGTH);
+ // if (mint.data.label === "777") {
+ // return metadata as any; // TODO: fix this
+ // }
+ // if (meta && meta[collection]) {
+ // const { [collection]: oldCollection, ...rest } = meta;
+ // const newCollection = {
+ // [name]: metadata,
+ // ...oldCollection,
+ // };
+ // return {
+ // [collection]: {
+ // ...newCollection,
+ // },
+ // ...rest,
+ // };
+ // }
+ // if (meta !== undefined) {
+ // return {
+ // [collection]: {
+ // [name]: metadata,
+ // },
+ // ...meta,
+ // };
+ // }
+ // return {
+ // [collection]: { [name]: metadata },
+ // };
+ // };
+ // Array.from(
+ // this.mints,
+ // (mint) =>
+ // {
+ // unit: mint[0],
+ // data: mint[1],
+ // }
+ // )
+ // .reduce((metadatums, mint) => {
+ // return metadatums.set(
+ // mint.data.label,
+ // forge(mint, metadatums.get(mint.data.label))
+ // );
+ // }, new Map())
+ // .forEach((metadata, label) => {
+ // this._txBuilder.add_json_metadatum(
+ // csl.BigNum.from_str(label),
+ // JSON.stringify(metadata)
+ // );
+ // });
+ }
+
private async addCollateralIfNeeded() {
if (this.isCollateralNeeded) {
const collaterals = await this.initiator.getCollateral();
From a02d7870f1c5750a8468d46df728dbebf6aa871e Mon Sep 17 00:00:00 2001
From: SIDANPillow
Date: Sat, 3 Aug 2024 11:32:28 +0800
Subject: [PATCH 04/17] feat:add value test cases
---
packages/mesh-common/test/data/value.test.ts | 317 +++++++++++++++++++
1 file changed, 317 insertions(+)
diff --git a/packages/mesh-common/test/data/value.test.ts b/packages/mesh-common/test/data/value.test.ts
index 82267685..1488a5fb 100644
--- a/packages/mesh-common/test/data/value.test.ts
+++ b/packages/mesh-common/test/data/value.test.ts
@@ -106,3 +106,320 @@ describe("Value", () => {
expect(JSON.stringify(val)).toBe(JSON.stringify(assets));
});
});
+
+// tests/value.test.ts
+import { Asset } from '@meshsdk/core';
+import { Value } from '../src/types';
+
+describe('Value class', () => {
+ describe('addAsset', () => {
+ it('should add a new asset correctly', () => {
+ const value = new Value();
+ const singleAsset: Asset = { unit: 'USDM', quantity: '100' };
+ value.addAsset(singleAsset);
+ // Assertions to verify the behavior of addAsset...
+ expect(value.value).toEqual({ USDM: BigInt(100) });
+ });
+ it('should add to an existing asset correctly', () => {
+ const value = new Value();
+ const singleAsset: Asset = { unit: 'USDM', quantity: '100' };
+ value.addAsset(singleAsset);
+ value.addAsset(singleAsset);
+ // Assertions to verify the behavior of addAsset...
+ expect(value.value).toEqual({ USDM: BigInt(200) });
+ });
+ it('should add multiple assets correctly', () => {
+ const value = new Value();
+ const assets: Asset[] = [
+ { unit: 'USDM', quantity: '100' },
+ { unit: 'ADA', quantity: '10' },
+ ];
+ value.addAsset(assets[0]).addAsset(assets[1]);
+ // Assertions to verify the behavior of addAsset...
+ expect(value.value).toEqual({ USDM: BigInt(100), ADA: BigInt(10) });
+ });
+ });
+ describe('addAssets', () => {
+ it('should add multiple assets correctly', () => {
+ const value = new Value();
+ const assets: Asset[] = [
+ { unit: 'USDM', quantity: '100' },
+ { unit: 'ADA', quantity: '10' },
+ { unit: 'USDM', quantity: '100' },
+ { unit: 'ADA', quantity: '10' },
+ ];
+ value.addAssets(assets);
+ // Assertions to verify the behavior of addAssets...
+ expect(value.value).toEqual({ USDM: BigInt(200), ADA: BigInt(20) });
+ });
+ it('should add multiple assets correctly with different units', () => {
+ const value = new Value();
+ const assets: Asset[] = [
+ { unit: 'USDM', quantity: '100' },
+ { unit: 'ADA', quantity: '10' },
+ { unit: 'USDC', quantity: '100' },
+ { unit: 'ADA', quantity: '10' },
+ ];
+ value.addAssets(assets);
+ // Assertions to verify the behavior of addAssets...
+ expect(value.value).toEqual({ USDM: BigInt(100), ADA: BigInt(20), USDC: BigInt(100) });
+ });
+ });
+ describe('negateAsset', () => {
+ describe('negateAsset', () => {
+ it('should subtract quantity from an existing asset', () => {
+ const value = new Value();
+ value.value = { ADA: 10n };
+ value.negateAsset({ unit: 'ADA', quantity: '5' });
+ expect(value.value).toEqual({ ADA: BigInt(5) });
+ });
+
+ it('should remove the asset if the resulting quantity is zero', () => {
+ const value = new Value();
+ value.value = { ADA: 10n };
+ value.negateAsset({ unit: 'ADA', quantity: '10' });
+ expect(value.value.ADA).toBeUndefined();
+ });
+
+ it('should allow negative quantity if the subtraction results in negative value', () => {
+ const value = new Value();
+ value.value = { ADA: 10n };
+ value.negateAsset({ unit: 'ADA', quantity: '15' });
+ expect(value.value).toEqual({ ADA: BigInt(-5) });
+ });
+
+ it('should add a new asset with negative quantity if the asset does not exist', () => {
+ const value = new Value();
+ value.negateAsset({ unit: 'ADA', quantity: '5' });
+ expect(value.value).toEqual({ ADA: BigInt(-5) });
+ });
+ });
+ });
+ describe('negateAssets', () => {
+ it('should subtract quantities from existing assets', () => {
+ const value = new Value();
+ value.value = { ADA: 20n, BTC: 10n };
+ value.negateAssets([
+ { unit: 'ADA', quantity: '5' },
+ { unit: 'BTC', quantity: '3' },
+ ]);
+ expect(value.value).toEqual({ ADA: BigInt(15), BTC: BigInt(7) });
+ });
+
+ it('should remove the asset if the resulting quantity is zero', () => {
+ const value = new Value();
+ value.value = { ADA: 10n, BTC: 5n };
+ value.negateAssets([
+ { unit: 'ADA', quantity: '10' },
+ { unit: 'BTC', quantity: '5' },
+ ]);
+ expect(value.value.ADA).toBeUndefined();
+ expect(value.value.BTC).toBeUndefined();
+ });
+
+ it('should allow negative quantity if the subtraction results in negative value', () => {
+ const value = new Value();
+ value.value = { ADA: 10n, BTC: 5n };
+ value.negateAssets([
+ { unit: 'ADA', quantity: '15' },
+ { unit: 'BTC', quantity: '10' },
+ ]);
+ expect(value.value).toEqual({ ADA: BigInt(-5), BTC: BigInt(-5) });
+ });
+
+ it('should add new assets with negative quantities if the assets do not exist', () => {
+ const value = new Value();
+ value.negateAssets([
+ { unit: 'ADA', quantity: '5' },
+ { unit: 'BTC', quantity: '3' },
+ ]);
+ expect(value.value).toEqual({ ADA: BigInt(-5), BTC: BigInt(-3) });
+ });
+
+ it('should handle a mix of existing and non-existing assets', () => {
+ const value = new Value();
+ value.value = { ADA: 10n };
+ value.negateAssets([
+ { unit: 'ADA', quantity: '5' },
+ { unit: 'BTC', quantity: '3' },
+ ]);
+ expect(value.value).toEqual({ ADA: BigInt(5), BTC: BigInt(-3) });
+ });
+ });
+ describe('get', () => {
+ it('should return the quantity of an existing asset', () => {
+ const value = new Value();
+ value.value = { ADA: 20n, BTC: 10n };
+ expect(value.get('ADA')).toEqual(BigInt(20));
+ expect(value.get('BTC')).toEqual(BigInt(10));
+ });
+
+ it('should return 0 for a non-existing asset', () => {
+ const value = new Value();
+ value.value = { ADA: 20n };
+ expect(value.get('BTC')).toEqual(BigInt(0));
+ });
+
+ it('should handle an empty value object', () => {
+ const value = new Value();
+ expect(value.get('ADA')).toEqual(BigInt(0));
+ });
+
+ it('should return the correct quantity after adding assets', () => {
+ const value = new Value();
+ value.value = { ADA: 20n };
+ value.addAsset({ unit: 'BTC', quantity: '10' });
+ expect(value.get('BTC')).toEqual(BigInt(10));
+ });
+
+ it('should return the correct quantity after subtracting assets', () => {
+ const value = new Value();
+ value.value = { ADA: 20n, BTC: 10n };
+ value.negateAssets([{ unit: 'BTC', quantity: '5' }]);
+ expect(value.get('BTC')).toEqual(BigInt(5));
+ });
+ });
+ describe('units', () => {
+ it('should return an empty object when value is empty', () => {
+ const value = new Value();
+ value.value = {};
+ expect(value.units()).toEqual({});
+ });
+
+ it('should return the correct structure for a single asset', () => {
+ const value = new Value();
+ value.value = { ADA: 20n };
+ expect(value.units()).toEqual({
+ ADA: [{ unit: 'ADA', quantity: BigInt(20) }],
+ });
+ });
+
+ it('should return the correct structure for multiple assets', () => {
+ const value = new Value();
+ value.value = { ADA: 20n, BTC: 10n };
+ expect(value.units()).toEqual({
+ ADA: [{ unit: 'ADA', quantity: BigInt(20) }],
+ BTC: [{ unit: 'BTC', quantity: BigInt(10) }],
+ });
+ });
+
+ it('should handle both positive and negative quantities correctly', () => {
+ const value = new Value();
+ value.value = { ADA: 20n, BTC: -10n };
+ expect(value.units()).toEqual({
+ ADA: [{ unit: 'ADA', quantity: BigInt(20) }],
+ BTC: [{ unit: 'BTC', quantity: BigInt(-10) }],
+ });
+ });
+ });
+ describe('geq', () => {
+ it('should return true if the value is greater than or equal to the target value for a specific unit', () => {
+ const value = new Value();
+ value.value = { ADA: 20n, BTC: 10n };
+ const target = new Value();
+ target.value = { ADA: 10n, BTC: 5n };
+ expect(value.geq('ADA', target)).toBe(true);
+ expect(value.geq('BTC', target)).toBe(true);
+ });
+
+ it('should return false if the value is less than the target value for a specific unit', () => {
+ const value = new Value();
+ value.value = { ADA: 20n, BTC: 10n };
+ const target = new Value();
+ target.value = { ADA: 30n, BTC: 15n };
+ expect(value.geq('ADA', target)).toBe(false);
+ expect(value.geq('BTC', target)).toBe(false);
+ });
+
+ it('should return true if the value is equal to the target value for a specific unit', () => {
+ const value = new Value();
+ value.value = { ADA: 20n, BTC: 10n };
+ const target = new Value();
+ target.value = { ADA: 20n, BTC: 10n };
+ expect(value.geq('ADA', target)).toBe(true);
+ expect(value.geq('BTC', target)).toBe(true);
+ });
+
+ it('should return false if the unit does not exist in value.value', () => {
+ const value = new Value();
+ value.value = { ADA: 20n, BTC: 10n };
+ const target = new Value();
+ target.value = { ETH: 5n };
+ expect(value.geq('ETH', target)).toBe(false);
+ });
+ });
+ describe('leq', () => {
+ it('should return true if the value is less than or equal to the target value for a specific unit', () => {
+ const value = new Value();
+ value.value = { ADA: 20n, BTC: 10n };
+ const target = new Value();
+ target.value = { ADA: 30n, BTC: 15n };
+ expect(value.leq('ADA', target)).toBe(true);
+ expect(value.leq('BTC', target)).toBe(true);
+ });
+
+ it('should return false if the value is greater than the target value for a specific unit', () => {
+ const value = new Value();
+ value.value = { ADA: 20n, BTC: 10n };
+ const target = new Value();
+ target.value = { ADA: 10n, BTC: 5n };
+ expect(value.leq('ADA', target)).toBe(false);
+ expect(value.leq('BTC', target)).toBe(false);
+ });
+
+ it('should return true if the value is equal to the target value for a specific unit', () => {
+ const value = new Value();
+ value.value = { ADA: 20n, BTC: 10n };
+ const target = new Value();
+ target.value = { ADA: 20n, BTC: 10n };
+ expect(value.leq('ADA', target)).toBe(true);
+ expect(value.leq('BTC', target)).toBe(true);
+ });
+
+ it('should return false if the unit does not exist in value.value', () => {
+ const value = new Value();
+ value.value = { ADA: 20n, BTC: 10n };
+ const target = new Value();
+ target.value = { ETH: 5n };
+ expect(value.leq('ETH', target)).toBe(false);
+ });
+ });
+ describe('isEmpty', () => {
+ it('should return true if the value is empty', () => {
+ const value = new Value();
+ value.value = {};
+ expect(value.isEmpty()).toBe(true);
+ });
+
+ it('should return false if the value is not empty', () => {
+ const value = new Value();
+ value.value = { ADA: 20n };
+ expect(value.isEmpty()).toBe(false);
+ });
+ });
+ describe('merge', () => {
+ it('should merge two values correctly', () => {
+ const value1 = new Value();
+ value1.value = { ADA: 20n, BTC: 10n };
+ const value2 = new Value();
+ value2.value = { ADA: 10n, BTC: 5n };
+ expect(value1.merge(value2).value).toEqual({ ADA: 30n, BTC: 15n });
+ });
+
+ it('should merge two values correctly with different units', () => {
+ const value1 = new Value();
+ value1.value = { ADA: 20n, BTC: 10n };
+ const value2 = new Value();
+ value2.value = { ETH: 10n, BTC: 5n };
+ expect(value1.merge(value2).value).toEqual({ ADA: 20n, BTC: 15n, ETH: 10n });
+ });
+
+ it('should merge two values correctly with negative quantities', () => {
+ const value1 = new Value();
+ value1.value = { ADA: 20n, BTC: -10n };
+ const value2 = new Value();
+ value2.value = { ADA: 10n, BTC: 5n };
+ expect(value1.merge(value2).value).toEqual({ ADA: 30n, BTC: -5n });
+ });
+ });
+});
\ No newline at end of file
From 423cc4a687fa3ce5c575ce566447b42e80b54715 Mon Sep 17 00:00:00 2001
From: SIDANPillow
Date: Sat, 3 Aug 2024 11:37:55 +0800
Subject: [PATCH 05/17] feat:comment out some value implementation and test
cases
---
package-lock.json | 37 +-
packages/mesh-common/src/data/value.ts | 459 +++++-----
packages/mesh-common/test/data/value.test.ts | 839 ++++++++++---------
3 files changed, 677 insertions(+), 658 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 8381022c..3aa6bcad 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8943,6 +8943,7 @@
"version": "3.9.0",
"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
"integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
+ "dev": true,
"funding": [
{
"type": "github",
@@ -11877,7 +11878,8 @@
"node_modules/hosted-git-info": {
"version": "2.8.9",
"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
- "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw=="
+ "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
+ "dev": true
},
"node_modules/html-escaper": {
"version": "2.0.2",
@@ -14677,6 +14679,7 @@
"version": "2.5.0",
"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
"integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+ "dev": true,
"dependencies": {
"hosted-git-info": "^2.1.4",
"resolve": "^1.10.0",
@@ -14688,6 +14691,7 @@
"version": "5.7.2",
"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
"integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+ "dev": true,
"bin": {
"semver": "bin/semver"
}
@@ -18874,6 +18878,7 @@
"version": "3.2.0",
"resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz",
"integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==",
+ "dev": true,
"dependencies": {
"spdx-expression-parse": "^3.0.0",
"spdx-license-ids": "^3.0.0"
@@ -18882,12 +18887,14 @@
"node_modules/spdx-exceptions": {
"version": "2.5.0",
"resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz",
- "integrity": "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w=="
+ "integrity": "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==",
+ "dev": true
},
"node_modules/spdx-expression-parse": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
"integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
+ "dev": true,
"dependencies": {
"spdx-exceptions": "^2.1.0",
"spdx-license-ids": "^3.0.0"
@@ -18896,7 +18903,8 @@
"node_modules/spdx-license-ids": {
"version": "3.0.18",
"resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.18.tgz",
- "integrity": "sha512-xxRs31BqRYHwiMzudOrpSiHtZ8i/GeionCBDSilhYRj+9gIcI8wCZTlXZKu9vZIVqViP3dcp9qE5G6AlIaD+TQ=="
+ "integrity": "sha512-xxRs31BqRYHwiMzudOrpSiHtZ8i/GeionCBDSilhYRj+9gIcI8wCZTlXZKu9vZIVqViP3dcp9qE5G6AlIaD+TQ==",
+ "dev": true
},
"node_modules/split-ca": {
"version": "1.0.1",
@@ -20469,6 +20477,7 @@
"version": "3.0.4",
"resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
"integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+ "dev": true,
"dependencies": {
"spdx-correct": "^3.0.0",
"spdx-expression-parse": "^3.0.0"
@@ -20824,6 +20833,7 @@
"version": "4.0.2",
"resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
"integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
+ "dev": true,
"dependencies": {
"imurmurhash": "^0.1.4",
"signal-exit": "^3.0.7"
@@ -20835,7 +20845,8 @@
"node_modules/write-file-atomic/node_modules/signal-exit": {
"version": "3.0.7",
"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
- "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
+ "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
+ "dev": true
},
"node_modules/ws": {
"version": "7.5.10",
@@ -21029,7 +21040,7 @@
},
"packages/mesh-common": {
"name": "@meshsdk/common",
- "version": "1.5.32",
+ "version": "1.6.1",
"license": "Apache-2.0",
"dependencies": {
"@emurgo/cip14-js": "3.0.1",
@@ -21045,7 +21056,7 @@
},
"packages/mesh-contract": {
"name": "@meshsdk/contract",
- "version": "1.5.32",
+ "version": "1.6.1",
"license": "Apache-2.0",
"dependencies": {
"@meshsdk/common": "*",
@@ -21064,7 +21075,7 @@
},
"packages/mesh-core": {
"name": "@meshsdk/core",
- "version": "1.5.32",
+ "version": "1.6.1",
"license": "Apache-2.0",
"dependencies": {
"@meshsdk/common": "*",
@@ -21085,7 +21096,7 @@
},
"packages/mesh-core-csl": {
"name": "@meshsdk/core-csl",
- "version": "1.5.32",
+ "version": "1.6.1",
"license": "Apache-2.0",
"dependencies": {
"@meshsdk/common": "*",
@@ -21105,7 +21116,7 @@
},
"packages/mesh-core-cst": {
"name": "@meshsdk/core-cst",
- "version": "1.5.32",
+ "version": "1.6.1",
"license": "Apache-2.0",
"dependencies": {
"@cardano-sdk/core": "^0.35.4",
@@ -21128,7 +21139,7 @@
},
"packages/mesh-provider": {
"name": "@meshsdk/provider",
- "version": "1.5.32",
+ "version": "1.6.1",
"license": "Apache-2.0",
"dependencies": {
"@meshsdk/common": "*",
@@ -21144,7 +21155,7 @@
},
"packages/mesh-react": {
"name": "@meshsdk/react",
- "version": "1.5.32",
+ "version": "1.6.1",
"license": "Apache-2.0",
"dependencies": {
"@meshsdk/common": "*",
@@ -21166,7 +21177,7 @@
},
"packages/mesh-transaction": {
"name": "@meshsdk/transaction",
- "version": "1.5.32",
+ "version": "1.6.1",
"license": "Apache-2.0",
"dependencies": {
"@meshsdk/common": "*",
@@ -21184,7 +21195,7 @@
},
"packages/mesh-wallet": {
"name": "@meshsdk/wallet",
- "version": "1.5.32",
+ "version": "1.6.1",
"license": "Apache-2.0",
"dependencies": {
"@meshsdk/common": "*",
diff --git a/packages/mesh-common/src/data/value.ts b/packages/mesh-common/src/data/value.ts
index 5599af87..1da217e6 100644
--- a/packages/mesh-common/src/data/value.ts
+++ b/packages/mesh-common/src/data/value.ts
@@ -15,238 +15,239 @@ import {
tokenName,
} from "./json";
-export type Value = AssocMap>;
-
-export type MValue = Map>;
-
-export const value = (assets: Asset[]): Value => {
- const valueMapToParse: [CurrencySymbol, AssocMap][] = [];
- const valueMap: { [key: string]: { [key: string]: number } } = {};
-
- assets.forEach((asset) => {
- const sanitizedName = asset.unit.replace("lovelace", "");
- const policy = sanitizedName.slice(0, 56) || "";
- const token = sanitizedName.slice(56) || "";
-
- if (!valueMap[policy]) {
- valueMap[policy] = {};
+// export type Value = AssocMap>;
+
+// export type MValue = Map>;
+
+// export const value = (assets: Asset[]): Value => {
+// const valueMapToParse: [CurrencySymbol, AssocMap][] = [];
+// const valueMap: { [key: string]: { [key: string]: number } } = {};
+
+// assets.forEach((asset) => {
+// const sanitizedName = asset.unit.replace("lovelace", "");
+// const policy = sanitizedName.slice(0, 56) || "";
+// const token = sanitizedName.slice(56) || "";
+
+// if (!valueMap[policy]) {
+// valueMap[policy] = {};
+// }
+
+// if (!valueMap[policy]![token]) {
+// valueMap[policy]![token] = Number(asset.quantity);
+// } else {
+// valueMap[policy]![token] += Number(asset.quantity);
+// }
+// });
+
+// Object.keys(valueMap).forEach((policy) => {
+// const policyByte = currencySymbol(policy);
+// const tokens: [TokenName, Integer][] = Object.keys(valueMap[policy]!).map(
+// (name) => [tokenName(name), integer(valueMap[policy]![name]!)],
+// );
+
+// const policyMap = assocMap(tokens);
+// valueMapToParse.push([policyByte, policyMap]);
+// });
+
+// return assocMap(valueMapToParse);
+// };
+
+// export const parsePlutusValueToAssets = (plutusValue: Value): Asset[] => {
+// const assets: Asset[] = [];
+
+// plutusValue.map.forEach((policyMap) => {
+// const policy = policyMap.k.bytes;
+// policyMap.v.map.forEach((tokenMap) => {
+// const token = tokenMap.k.bytes;
+// const quantity = tokenMap.v.int.toString();
+// const unsanitizedUnit = policy + token;
+// const unit = unsanitizedUnit === "" ? "lovelace" : unsanitizedUnit;
+// assets.push({ unit, quantity });
+// });
+// });
+
+// return assets;
+// };
+
+export class Value {
+ value: Record;
+
+ constructor() {
+ this.value = {};
+ }
+
+ /**
+ * Add an asset to the Value class's value record. If an asset with the same unit already exists in the value record, the quantity of the
+ * existing asset will be increased by the quantity of the new asset. If no such asset exists, the new asset will be added to the value record.
+ * Implementation:
+ * 1. Check if the unit of the asset already exists in the value record.
+ * 2. If the unit exists, add the new quantity to the existing quantity.
+ * 3. If the unit does not exist, add the unti to the object.
+ * 4. Return the Value class instance.
+ * @param asset
+ * @returns this
+ */
+ addAsset = (asset: Asset): this => {
+ const quantity = BigInt(asset.quantity);
+ const { unit } = asset;
+
+ if (this.value[unit]) {
+ this.value[unit] += quantity;
+ } else {
+ this.value[unit] = quantity;
}
-
- if (!valueMap[policy]![token]) {
- valueMap[policy]![token] = Number(asset.quantity);
+ return this;
+ };
+
+ /**
+ * Add an array of assets to the Value class's value record. If an asset with the same unit already exists in the value record, the quantity of the
+ * existing asset will be increased by the quantity of the new asset. If no such asset exists, the new assets under the array of assets will be added to the value record.
+ * Implementation:
+ * 1. Iterate over each asset in the 'assets' array.
+ * 2. For each asset, check if the unit of the asset already exists in the value record.
+ * 3. If the unit exists, add the new quantity to the existing quantity.
+ * 4. If the unit does not exist, add the unti to the object.
+ * 5. Return the Value class instance.
+ * @param assets
+ * @returns this
+ */
+ addAssets = (assets: Asset[]): this => {
+ assets.forEach((asset) => {
+ this.addAsset(asset);
+ });
+ return this;
+ };
+
+ /**
+ * Substract an asset from the Value class's value record. If an asset with the same unit already exists in the value record, the quantity of the
+ * existing asset will be decreased by the quantity of the new asset. If no such asset exists, an error message should be printed.
+ * Implementation:
+ * 1. Check if the unit of the asset already exists in the value record.
+ * 2. If the unit exists, subtract the new quantity from the existing quantity.
+ * 3. If the unit does not exist, print an error message.
+ * @param asset
+ * @returns this
+ */
+ negateAsset = (asset: Asset): this => {
+ const { unit, quantity } = asset;
+
+ const currentQuantity = this.value[unit] || BigInt(0);
+ const newQuantity = currentQuantity - BigInt(quantity);
+
+ if (newQuantity === BigInt(0)) {
+ delete this.value[unit];
} else {
- valueMap[policy]![token] += Number(asset.quantity);
+ this.value[unit] = newQuantity;
}
- });
-
- Object.keys(valueMap).forEach((policy) => {
- const policyByte = currencySymbol(policy);
- const tokens: [TokenName, Integer][] = Object.keys(valueMap[policy]!).map(
- (name) => [tokenName(name), integer(valueMap[policy]![name]!)],
- );
-
- const policyMap = assocMap(tokens);
- valueMapToParse.push([policyByte, policyMap]);
- });
-
- return assocMap(valueMapToParse);
-};
-
-export const parsePlutusValueToAssets = (plutusValue: Value): Asset[] => {
- const assets: Asset[] = [];
-
- plutusValue.map.forEach((policyMap) => {
- const policy = policyMap.k.bytes;
- policyMap.v.map.forEach((tokenMap) => {
- const token = tokenMap.k.bytes;
- const quantity = tokenMap.v.int.toString();
- const unsanitizedUnit = policy + token;
- const unit = unsanitizedUnit === "" ? "lovelace" : unsanitizedUnit;
- assets.push({ unit, quantity });
+ return this;
+ };
+
+ /**
+ * Subtract an array of assets from the Value class's value record. If an asset with the same unit already exists in the value record, the quantity of the
+ * existing asset will be decreased by the quantity of the new asset. If no such asset exists, an error message should be printed.
+ * @param assets
+ * @returns this
+ */
+ negateAssets = (assets: Asset[]): this => {
+ assets.forEach((asset) => {
+ this.negateAsset(asset);
});
- });
-
- return assets;
-};
-
-export class MMValue {
- value: Record;
-
- constructor() {
- this.value = {};
+ return this;
+ };
+
+ /**
+ * Get the quantity of asset object per unit
+ * @param unit
+ * @returns
+ */
+ get = (unit: string): bigint => {
+ return this.value[unit] ? BigInt(this.value[unit]) : BigInt(0);
+ };
+
+ /**
+ * Get all assets (return Record of Asset[])
+ * @param
+ * @returns Record
+ */
+ units = (): Record => {
+ const result: Record = {};
+ Object.keys(this.value).forEach((unit) => {
+ if (!result[unit]) {
+ result[unit] = [];
+ }
+ result[unit].push({ unit, quantity: BigInt(this.value[unit]) });
+ });
+ return result;
+ };
+
+ /**
+ * Check if the value is greater than or equal to an inputted value
+ * @param unit - The unit to compare (e.g., "ADA")
+ * @param other - The value to compare against
+ * @returns boolean
+ */
+ // geq = (unit: string, other: Value): boolean => {
+ // const thisValue = this.get(unit);
+ // const otherValue = other.get(unit);
+ // return thisValue >= otherValue;
+ // };
+
+ geq = (unit: string, other: Value): boolean => {
+ if (this.value[unit] === undefined || other.value[unit] === undefined) {
+ return false;
+ }
+ return BigInt(this.value[unit]) >= BigInt(other.value[unit]);
+ };
+
+ /**
+ * Check if the value is less than or equal to an inputted value
+ * @param unit - The unit to compare (e.g., "ADA")
+ * @param other - The value to compare against
+ * @returns boolean
+ */
+ // leq = (unit: string, other: Value): boolean => {
+ // const thisValue = this.get(unit);
+ // const otherValue = other.get(unit);
+ // if (otherValue === undefined) {
+ // return false;
+ // }
+
+ // return thisValue <= otherValue;
+ // };
+
+ leq = (unit: string, other: Value): boolean => {
+ if (this.value[unit] === undefined || other.value[unit] === undefined) {
+ return false;
}
+ return BigInt(this.value[unit]) <= BigInt(other.value[unit]);
+ };
+
+ /**
+ * Check if the value is empty
+ * @param
+ * @returns boolean
+ */
+ isEmpty = (): boolean => {
+ return Object.keys(this.value).length === 0;
+ };
+
+ /**
+ * Merge the given values
+ * @param values
+ * @returns this
+ */
+ merge = (values: Value | Value[]): this => {
+ const valuesArray = Array.isArray(values) ? values : [values];
+
+ valuesArray.forEach((other) => {
+ Object.entries(other.value).forEach(([key, value]) => {
+ this.value[key] =
+ (this.value[key] !== undefined
+ ? BigInt(this.value[key])
+ : BigInt(0)) + BigInt(value);
+ });
+ });
- /**
- * Add an asset to the Value class's value record. If an asset with the same unit already exists in the value record, the quantity of the
- * existing asset will be increased by the quantity of the new asset. If no such asset exists, the new asset will be added to the value record.
- * Implementation:
- * 1. Check if the unit of the asset already exists in the value record.
- * 2. If the unit exists, add the new quantity to the existing quantity.
- * 3. If the unit does not exist, add the unti to the object.
- * 4. Return the Value class instance.
- * @param asset
- * @returns this
- */
- addAsset = (asset: Asset): this => {
- const quantity = BigInt(asset.quantity);
- const { unit } = asset;
-
- if (this.value[unit]) {
- this.value[unit] += quantity;
- } else {
- this.value[unit] = quantity;
- }
- return this;
- };
-
- /**
- * Add an array of assets to the Value class's value record. If an asset with the same unit already exists in the value record, the quantity of the
- * existing asset will be increased by the quantity of the new asset. If no such asset exists, the new assets under the array of assets will be added to the value record.
- * Implementation:
- * 1. Iterate over each asset in the 'assets' array.
- * 2. For each asset, check if the unit of the asset already exists in the value record.
- * 3. If the unit exists, add the new quantity to the existing quantity.
- * 4. If the unit does not exist, add the unti to the object.
- * 5. Return the Value class instance.
- * @param assets
- * @returns this
- */
- addAssets = (assets: Asset[]): this => {
- assets.forEach((asset) => {
- this.addAsset(asset);
- });
- return this;
- };
-
- /**
- * Substract an asset from the Value class's value record. If an asset with the same unit already exists in the value record, the quantity of the
- * existing asset will be decreased by the quantity of the new asset. If no such asset exists, an error message should be printed.
- * Implementation:
- * 1. Check if the unit of the asset already exists in the value record.
- * 2. If the unit exists, subtract the new quantity from the existing quantity.
- * 3. If the unit does not exist, print an error message.
- * @param asset
- * @returns this
- */
- negateAsset = (asset: Asset): this => {
- const { unit, quantity } = asset;
-
- const currentQuantity = this.value[unit] || BigInt(0);
- const newQuantity = currentQuantity - BigInt(quantity);
-
- if (newQuantity === BigInt(0)) {
- delete this.value[unit];
- } else {
- this.value[unit] = newQuantity;
- }
- return this;
- };
-
- /**
- * Subtract an array of assets from the Value class's value record. If an asset with the same unit already exists in the value record, the quantity of the
- * existing asset will be decreased by the quantity of the new asset. If no such asset exists, an error message should be printed.
- * @param assets
- * @returns this
- */
- negateAssets = (assets: Asset[]): this => {
- assets.forEach((asset) => {
- this.negateAsset(asset);
- });
- return this;
- };
-
- /**
- * Get the quantity of asset object per unit
- * @param unit
- * @returns
- */
- get = (unit: string): bigint => {
- return this.value[unit] ? BigInt(this.value[unit]) : BigInt(0);
- };
-
- /**
- * Get all assets (return Record of Asset[])
- * @param
- * @returns Record
- */
- units = (): Record => {
- const result: Record = {};
- Object.keys(this.value).forEach((unit) => {
- if (!result[unit]) {
- result[unit] = [];
- }
- result[unit].push({ unit, quantity: BigInt(this.value[unit]) });
- });
- return result;
- };
-
- /**
- * Check if the value is greater than or equal to an inputted value
- * @param unit - The unit to compare (e.g., "ADA")
- * @param other - The value to compare against
- * @returns boolean
- */
- // geq = (unit: string, other: Value): boolean => {
- // const thisValue = this.get(unit);
- // const otherValue = other.get(unit);
- // return thisValue >= otherValue;
- // };
-
- geq = (unit: string, other: Value): boolean => {
- if (this.value[unit] === undefined || other.value[unit] === undefined) {
- return false;
- }
- return BigInt(this.value[unit]) >= BigInt(other.value[unit]);
- };
-
- /**
- * Check if the value is less than or equal to an inputted value
- * @param unit - The unit to compare (e.g., "ADA")
- * @param other - The value to compare against
- * @returns boolean
- */
- // leq = (unit: string, other: Value): boolean => {
- // const thisValue = this.get(unit);
- // const otherValue = other.get(unit);
- // if (otherValue === undefined) {
- // return false;
- // }
-
- // return thisValue <= otherValue;
- // };
-
- leq = (unit: string, other: Value): boolean => {
- if (this.value[unit] === undefined || other.value[unit] === undefined) {
- return false;
- }
- return BigInt(this.value[unit]) <= BigInt(other.value[unit]);
- };
-
- /**
- * Check if the value is empty
- * @param
- * @returns boolean
- */
- isEmpty = (): boolean => {
- return Object.keys(this.value).length === 0;
- };
-
- /**
- * Merge the given values
- * @param values
- * @returns this
- */
- merge = (values: Value | Value[]): this => {
- const valuesArray = Array.isArray(values) ? values : [values];
-
- valuesArray.forEach((other) => {
- Object.entries(other.value).forEach(([key, value]) => {
- this.value[key] =
- (this.value[key] !== undefined ? BigInt(this.value[key]) : BigInt(0)) +
- BigInt(value);
- });
- });
-
- return this;
- };
-}
\ No newline at end of file
+ return this;
+ };
+}
diff --git a/packages/mesh-common/test/data/value.test.ts b/packages/mesh-common/test/data/value.test.ts
index 1488a5fb..7ef3ef2b 100644
--- a/packages/mesh-common/test/data/value.test.ts
+++ b/packages/mesh-common/test/data/value.test.ts
@@ -1,425 +1,432 @@
-import {
- Asset,
- byteString,
- ByteString,
- dict,
- Dict,
- Integer,
- integer,
- parsePlutusValueToAssets,
- Value,
- value,
-} from "@meshsdk/common";
-
-describe("value", () => {
- test("Simple ADA Value", () => {
- const val: Asset[] = [{ unit: "lovelace", quantity: "1000000" }];
- const datum: Value = value(val);
-
- const nameMap = dict([[byteString(""), integer(1000000)]]);
- const valMap = dict>([[byteString(""), nameMap]]);
- expect(JSON.stringify(datum)).toBe(JSON.stringify(valMap));
+// import {
+// Asset,
+// byteString,
+// ByteString,
+// dict,
+// Dict,
+// Integer,
+// integer,
+// parsePlutusValueToAssets,
+// Value,
+// value,
+// } from "@meshsdk/common";
+
+// describe("value", () => {
+// test("Simple ADA Value", () => {
+// const val: Asset[] = [{ unit: "lovelace", quantity: "1000000" }];
+// const datum: Value = value(val);
+
+// const nameMap = dict([[byteString(""), integer(1000000)]]);
+// const valMap = dict>([[byteString(""), nameMap]]);
+// expect(JSON.stringify(datum)).toBe(JSON.stringify(valMap));
+// });
+// test("Simple token Value", () => {
+// const val: Asset[] = [
+// {
+// unit: "baefdc6c5b191be372a794cd8d40d839ec0dbdd3c28957267dc8170074657374696e676e657777616c2e616461",
+// quantity: "345",
+// },
+// ];
+// const datum: Value = value(val);
+
+// const nameMap = dict([
+// [byteString("74657374696e676e657777616c2e616461"), integer(345)],
+// ]);
+// const valMap = dict>([
+// [
+// byteString("baefdc6c5b191be372a794cd8d40d839ec0dbdd3c28957267dc81700"),
+// nameMap,
+// ],
+// ]);
+// expect(JSON.stringify(datum)).toBe(JSON.stringify(valMap));
+// });
+// test("Complex Value", () => {
+// const val: Asset[] = [
+// { unit: "lovelace", quantity: "1000000" },
+// {
+// unit: "baefdc6c5b191be372a794cd8d40d839ec0dbdd3c28957267dc8170074657374696e676e657777616c2e616461",
+// quantity: "345",
+// },
+// {
+// unit: "baefdc6c5b191be372a794cd8d40d839ec0dbdd3c28957267dc817001234",
+// quantity: "567",
+// },
+// ];
+// const datum: Value = value(val);
+
+// const nameMap = dict([
+// [byteString("1234"), integer(567)],
+// [byteString("74657374696e676e657777616c2e616461"), integer(345)],
+// ]);
+// const valMap = dict>([
+// [byteString(""), dict([[byteString(""), integer(1000000)]])],
+// [
+// byteString("baefdc6c5b191be372a794cd8d40d839ec0dbdd3c28957267dc81700"),
+// nameMap,
+// ],
+// ]);
+// expect(JSON.stringify(datum)).toBe(JSON.stringify(valMap));
+// });
+// });
+
+// describe("Value", () => {
+// test("Simple ADA Value", () => {
+// const val: Asset[] = [{ unit: "lovelace", quantity: "1000000" }];
+// const plutusValue: Value = value(val);
+// const assets: Asset[] = parsePlutusValueToAssets(plutusValue);
+
+// expect(JSON.stringify(val)).toBe(JSON.stringify(assets));
+// });
+// test("Simple token Value", () => {
+// const val: Asset[] = [
+// {
+// unit: "baefdc6c5b191be372a794cd8d40d839ec0dbdd3c28957267dc8170074657374696e676e657777616c2e616461",
+// quantity: "345",
+// },
+// ];
+// const plutusValue: Value = value(val);
+// const assets: Asset[] = parsePlutusValueToAssets(plutusValue);
+
+// expect(JSON.stringify(val)).toBe(JSON.stringify(assets));
+// });
+// test("Complex Value", () => {
+// const val: Asset[] = [
+// { unit: "lovelace", quantity: "1000000" },
+// {
+// unit: "baefdc6c5b191be372a794cd8d40d839ec0dbdd3c28957267dc817001234",
+// quantity: "567",
+// },
+// {
+// unit: "baefdc6c5b191be372a794cd8d40d839ec0dbdd3c28957267dc8170074657374696e676e657777616c2e616461",
+// quantity: "345",
+// },
+// ];
+// const plutusValue: Value = value(val);
+// const assets: Asset[] = parsePlutusValueToAssets(plutusValue);
+// expect(JSON.stringify(val)).toBe(JSON.stringify(assets));
+// });
+// });
+
+// tests/value.test.ts
+import { Asset, Value } from "@meshsdk/common";
+
+describe("Value class", () => {
+ describe("addAsset", () => {
+ it("should add a new asset correctly", () => {
+ const value = new Value();
+ const singleAsset: Asset = { unit: "USDM", quantity: "100" };
+ value.addAsset(singleAsset);
+ // Assertions to verify the behavior of addAsset...
+ expect(value.value).toEqual({ USDM: BigInt(100) });
+ });
+ it("should add to an existing asset correctly", () => {
+ const value = new Value();
+ const singleAsset: Asset = { unit: "USDM", quantity: "100" };
+ value.addAsset(singleAsset);
+ value.addAsset(singleAsset);
+ // Assertions to verify the behavior of addAsset...
+ expect(value.value).toEqual({ USDM: BigInt(200) });
+ });
+ it("should add multiple assets correctly", () => {
+ const value = new Value();
+ const assets: Asset[] = [
+ { unit: "USDM", quantity: "100" },
+ { unit: "ADA", quantity: "10" },
+ ];
+ value.addAsset(assets[0]).addAsset(assets[1]);
+ // Assertions to verify the behavior of addAsset...
+ expect(value.value).toEqual({ USDM: BigInt(100), ADA: BigInt(10) });
+ });
});
- test("Simple token Value", () => {
- const val: Asset[] = [
- {
- unit: "baefdc6c5b191be372a794cd8d40d839ec0dbdd3c28957267dc8170074657374696e676e657777616c2e616461",
- quantity: "345",
- },
- ];
- const datum: Value = value(val);
-
- const nameMap = dict([
- [byteString("74657374696e676e657777616c2e616461"), integer(345)],
- ]);
- const valMap = dict>([
- [
- byteString("baefdc6c5b191be372a794cd8d40d839ec0dbdd3c28957267dc81700"),
- nameMap,
- ],
- ]);
- expect(JSON.stringify(datum)).toBe(JSON.stringify(valMap));
+ describe("addAssets", () => {
+ it("should add multiple assets correctly", () => {
+ const value = new Value();
+ const assets: Asset[] = [
+ { unit: "USDM", quantity: "100" },
+ { unit: "ADA", quantity: "10" },
+ { unit: "USDM", quantity: "100" },
+ { unit: "ADA", quantity: "10" },
+ ];
+ value.addAssets(assets);
+ // Assertions to verify the behavior of addAssets...
+ expect(value.value).toEqual({ USDM: BigInt(200), ADA: BigInt(20) });
+ });
+ it("should add multiple assets correctly with different units", () => {
+ const value = new Value();
+ const assets: Asset[] = [
+ { unit: "USDM", quantity: "100" },
+ { unit: "ADA", quantity: "10" },
+ { unit: "USDC", quantity: "100" },
+ { unit: "ADA", quantity: "10" },
+ ];
+ value.addAssets(assets);
+ // Assertions to verify the behavior of addAssets...
+ expect(value.value).toEqual({
+ USDM: BigInt(100),
+ ADA: BigInt(20),
+ USDC: BigInt(100),
+ });
+ });
});
- test("Complex Value", () => {
- const val: Asset[] = [
- { unit: "lovelace", quantity: "1000000" },
- {
- unit: "baefdc6c5b191be372a794cd8d40d839ec0dbdd3c28957267dc8170074657374696e676e657777616c2e616461",
- quantity: "345",
- },
- {
- unit: "baefdc6c5b191be372a794cd8d40d839ec0dbdd3c28957267dc817001234",
- quantity: "567",
- },
- ];
- const datum: Value = value(val);
-
- const nameMap = dict([
- [byteString("1234"), integer(567)],
- [byteString("74657374696e676e657777616c2e616461"), integer(345)],
- ]);
- const valMap = dict>([
- [byteString(""), dict([[byteString(""), integer(1000000)]])],
- [
- byteString("baefdc6c5b191be372a794cd8d40d839ec0dbdd3c28957267dc81700"),
- nameMap,
- ],
- ]);
- expect(JSON.stringify(datum)).toBe(JSON.stringify(valMap));
+ describe("negateAsset", () => {
+ describe("negateAsset", () => {
+ it("should subtract quantity from an existing asset", () => {
+ const value = new Value();
+ value.value = { ADA: 10n };
+ value.negateAsset({ unit: "ADA", quantity: "5" });
+ expect(value.value).toEqual({ ADA: BigInt(5) });
+ });
+
+ it("should remove the asset if the resulting quantity is zero", () => {
+ const value = new Value();
+ value.value = { ADA: 10n };
+ value.negateAsset({ unit: "ADA", quantity: "10" });
+ expect(value.value.ADA).toBeUndefined();
+ });
+
+ it("should allow negative quantity if the subtraction results in negative value", () => {
+ const value = new Value();
+ value.value = { ADA: 10n };
+ value.negateAsset({ unit: "ADA", quantity: "15" });
+ expect(value.value).toEqual({ ADA: BigInt(-5) });
+ });
+
+ it("should add a new asset with negative quantity if the asset does not exist", () => {
+ const value = new Value();
+ value.negateAsset({ unit: "ADA", quantity: "5" });
+ expect(value.value).toEqual({ ADA: BigInt(-5) });
+ });
+ });
});
-});
+ describe("negateAssets", () => {
+ it("should subtract quantities from existing assets", () => {
+ const value = new Value();
+ value.value = { ADA: 20n, BTC: 10n };
+ value.negateAssets([
+ { unit: "ADA", quantity: "5" },
+ { unit: "BTC", quantity: "3" },
+ ]);
+ expect(value.value).toEqual({ ADA: BigInt(15), BTC: BigInt(7) });
+ });
+
+ it("should remove the asset if the resulting quantity is zero", () => {
+ const value = new Value();
+ value.value = { ADA: 10n, BTC: 5n };
+ value.negateAssets([
+ { unit: "ADA", quantity: "10" },
+ { unit: "BTC", quantity: "5" },
+ ]);
+ expect(value.value.ADA).toBeUndefined();
+ expect(value.value.BTC).toBeUndefined();
+ });
+
+ it("should allow negative quantity if the subtraction results in negative value", () => {
+ const value = new Value();
+ value.value = { ADA: 10n, BTC: 5n };
+ value.negateAssets([
+ { unit: "ADA", quantity: "15" },
+ { unit: "BTC", quantity: "10" },
+ ]);
+ expect(value.value).toEqual({ ADA: BigInt(-5), BTC: BigInt(-5) });
+ });
+
+ it("should add new assets with negative quantities if the assets do not exist", () => {
+ const value = new Value();
+ value.negateAssets([
+ { unit: "ADA", quantity: "5" },
+ { unit: "BTC", quantity: "3" },
+ ]);
+ expect(value.value).toEqual({ ADA: BigInt(-5), BTC: BigInt(-3) });
+ });
+
+ it("should handle a mix of existing and non-existing assets", () => {
+ const value = new Value();
+ value.value = { ADA: 10n };
+ value.negateAssets([
+ { unit: "ADA", quantity: "5" },
+ { unit: "BTC", quantity: "3" },
+ ]);
+ expect(value.value).toEqual({ ADA: BigInt(5), BTC: BigInt(-3) });
+ });
+ });
+ describe("get", () => {
+ it("should return the quantity of an existing asset", () => {
+ const value = new Value();
+ value.value = { ADA: 20n, BTC: 10n };
+ expect(value.get("ADA")).toEqual(BigInt(20));
+ expect(value.get("BTC")).toEqual(BigInt(10));
+ });
+
+ it("should return 0 for a non-existing asset", () => {
+ const value = new Value();
+ value.value = { ADA: 20n };
+ expect(value.get("BTC")).toEqual(BigInt(0));
+ });
+
+ it("should handle an empty value object", () => {
+ const value = new Value();
+ expect(value.get("ADA")).toEqual(BigInt(0));
+ });
+
+ it("should return the correct quantity after adding assets", () => {
+ const value = new Value();
+ value.value = { ADA: 20n };
+ value.addAsset({ unit: "BTC", quantity: "10" });
+ expect(value.get("BTC")).toEqual(BigInt(10));
+ });
+
+ it("should return the correct quantity after subtracting assets", () => {
+ const value = new Value();
+ value.value = { ADA: 20n, BTC: 10n };
+ value.negateAssets([{ unit: "BTC", quantity: "5" }]);
+ expect(value.get("BTC")).toEqual(BigInt(5));
+ });
+ });
+ describe("units", () => {
+ it("should return an empty object when value is empty", () => {
+ const value = new Value();
+ value.value = {};
+ expect(value.units()).toEqual({});
+ });
-describe("Value", () => {
- test("Simple ADA Value", () => {
- const val: Asset[] = [{ unit: "lovelace", quantity: "1000000" }];
- const plutusValue: Value = value(val);
- const assets: Asset[] = parsePlutusValueToAssets(plutusValue);
+ it("should return the correct structure for a single asset", () => {
+ const value = new Value();
+ value.value = { ADA: 20n };
+ expect(value.units()).toEqual({
+ ADA: [{ unit: "ADA", quantity: BigInt(20) }],
+ });
+ });
+
+ it("should return the correct structure for multiple assets", () => {
+ const value = new Value();
+ value.value = { ADA: 20n, BTC: 10n };
+ expect(value.units()).toEqual({
+ ADA: [{ unit: "ADA", quantity: BigInt(20) }],
+ BTC: [{ unit: "BTC", quantity: BigInt(10) }],
+ });
+ });
+
+ it("should handle both positive and negative quantities correctly", () => {
+ const value = new Value();
+ value.value = { ADA: 20n, BTC: -10n };
+ expect(value.units()).toEqual({
+ ADA: [{ unit: "ADA", quantity: BigInt(20) }],
+ BTC: [{ unit: "BTC", quantity: BigInt(-10) }],
+ });
+ });
+ });
+ describe("geq", () => {
+ it("should return true if the value is greater than or equal to the target value for a specific unit", () => {
+ const value = new Value();
+ value.value = { ADA: 20n, BTC: 10n };
+ const target = new Value();
+ target.value = { ADA: 10n, BTC: 5n };
+ expect(value.geq("ADA", target)).toBe(true);
+ expect(value.geq("BTC", target)).toBe(true);
+ });
+
+ it("should return false if the value is less than the target value for a specific unit", () => {
+ const value = new Value();
+ value.value = { ADA: 20n, BTC: 10n };
+ const target = new Value();
+ target.value = { ADA: 30n, BTC: 15n };
+ expect(value.geq("ADA", target)).toBe(false);
+ expect(value.geq("BTC", target)).toBe(false);
+ });
+
+ it("should return true if the value is equal to the target value for a specific unit", () => {
+ const value = new Value();
+ value.value = { ADA: 20n, BTC: 10n };
+ const target = new Value();
+ target.value = { ADA: 20n, BTC: 10n };
+ expect(value.geq("ADA", target)).toBe(true);
+ expect(value.geq("BTC", target)).toBe(true);
+ });
+
+ it("should return false if the unit does not exist in value.value", () => {
+ const value = new Value();
+ value.value = { ADA: 20n, BTC: 10n };
+ const target = new Value();
+ target.value = { ETH: 5n };
+ expect(value.geq("ETH", target)).toBe(false);
+ });
+ });
+ describe("leq", () => {
+ it("should return true if the value is less than or equal to the target value for a specific unit", () => {
+ const value = new Value();
+ value.value = { ADA: 20n, BTC: 10n };
+ const target = new Value();
+ target.value = { ADA: 30n, BTC: 15n };
+ expect(value.leq("ADA", target)).toBe(true);
+ expect(value.leq("BTC", target)).toBe(true);
+ });
- expect(JSON.stringify(val)).toBe(JSON.stringify(assets));
+ it("should return false if the value is greater than the target value for a specific unit", () => {
+ const value = new Value();
+ value.value = { ADA: 20n, BTC: 10n };
+ const target = new Value();
+ target.value = { ADA: 10n, BTC: 5n };
+ expect(value.leq("ADA", target)).toBe(false);
+ expect(value.leq("BTC", target)).toBe(false);
+ });
+
+ it("should return true if the value is equal to the target value for a specific unit", () => {
+ const value = new Value();
+ value.value = { ADA: 20n, BTC: 10n };
+ const target = new Value();
+ target.value = { ADA: 20n, BTC: 10n };
+ expect(value.leq("ADA", target)).toBe(true);
+ expect(value.leq("BTC", target)).toBe(true);
+ });
+
+ it("should return false if the unit does not exist in value.value", () => {
+ const value = new Value();
+ value.value = { ADA: 20n, BTC: 10n };
+ const target = new Value();
+ target.value = { ETH: 5n };
+ expect(value.leq("ETH", target)).toBe(false);
+ });
});
- test("Simple token Value", () => {
- const val: Asset[] = [
- {
- unit: "baefdc6c5b191be372a794cd8d40d839ec0dbdd3c28957267dc8170074657374696e676e657777616c2e616461",
- quantity: "345",
- },
- ];
- const plutusValue: Value = value(val);
- const assets: Asset[] = parsePlutusValueToAssets(plutusValue);
-
- expect(JSON.stringify(val)).toBe(JSON.stringify(assets));
+ describe("isEmpty", () => {
+ it("should return true if the value is empty", () => {
+ const value = new Value();
+ value.value = {};
+ expect(value.isEmpty()).toBe(true);
+ });
+
+ it("should return false if the value is not empty", () => {
+ const value = new Value();
+ value.value = { ADA: 20n };
+ expect(value.isEmpty()).toBe(false);
+ });
});
- test("Complex Value", () => {
- const val: Asset[] = [
- { unit: "lovelace", quantity: "1000000" },
- {
- unit: "baefdc6c5b191be372a794cd8d40d839ec0dbdd3c28957267dc817001234",
- quantity: "567",
- },
- {
- unit: "baefdc6c5b191be372a794cd8d40d839ec0dbdd3c28957267dc8170074657374696e676e657777616c2e616461",
- quantity: "345",
- },
- ];
- const plutusValue: Value = value(val);
- const assets: Asset[] = parsePlutusValueToAssets(plutusValue);
- expect(JSON.stringify(val)).toBe(JSON.stringify(assets));
+ describe("merge", () => {
+ it("should merge two values correctly", () => {
+ const value1 = new Value();
+ value1.value = { ADA: 20n, BTC: 10n };
+ const value2 = new Value();
+ value2.value = { ADA: 10n, BTC: 5n };
+ expect(value1.merge(value2).value).toEqual({ ADA: 30n, BTC: 15n });
+ });
+
+ it("should merge two values correctly with different units", () => {
+ const value1 = new Value();
+ value1.value = { ADA: 20n, BTC: 10n };
+ const value2 = new Value();
+ value2.value = { ETH: 10n, BTC: 5n };
+ expect(value1.merge(value2).value).toEqual({
+ ADA: 20n,
+ BTC: 15n,
+ ETH: 10n,
+ });
+ });
+
+ it("should merge two values correctly with negative quantities", () => {
+ const value1 = new Value();
+ value1.value = { ADA: 20n, BTC: -10n };
+ const value2 = new Value();
+ value2.value = { ADA: 10n, BTC: 5n };
+ expect(value1.merge(value2).value).toEqual({ ADA: 30n, BTC: -5n });
+ });
});
});
-
-// tests/value.test.ts
-import { Asset } from '@meshsdk/core';
-import { Value } from '../src/types';
-
-describe('Value class', () => {
- describe('addAsset', () => {
- it('should add a new asset correctly', () => {
- const value = new Value();
- const singleAsset: Asset = { unit: 'USDM', quantity: '100' };
- value.addAsset(singleAsset);
- // Assertions to verify the behavior of addAsset...
- expect(value.value).toEqual({ USDM: BigInt(100) });
- });
- it('should add to an existing asset correctly', () => {
- const value = new Value();
- const singleAsset: Asset = { unit: 'USDM', quantity: '100' };
- value.addAsset(singleAsset);
- value.addAsset(singleAsset);
- // Assertions to verify the behavior of addAsset...
- expect(value.value).toEqual({ USDM: BigInt(200) });
- });
- it('should add multiple assets correctly', () => {
- const value = new Value();
- const assets: Asset[] = [
- { unit: 'USDM', quantity: '100' },
- { unit: 'ADA', quantity: '10' },
- ];
- value.addAsset(assets[0]).addAsset(assets[1]);
- // Assertions to verify the behavior of addAsset...
- expect(value.value).toEqual({ USDM: BigInt(100), ADA: BigInt(10) });
- });
- });
- describe('addAssets', () => {
- it('should add multiple assets correctly', () => {
- const value = new Value();
- const assets: Asset[] = [
- { unit: 'USDM', quantity: '100' },
- { unit: 'ADA', quantity: '10' },
- { unit: 'USDM', quantity: '100' },
- { unit: 'ADA', quantity: '10' },
- ];
- value.addAssets(assets);
- // Assertions to verify the behavior of addAssets...
- expect(value.value).toEqual({ USDM: BigInt(200), ADA: BigInt(20) });
- });
- it('should add multiple assets correctly with different units', () => {
- const value = new Value();
- const assets: Asset[] = [
- { unit: 'USDM', quantity: '100' },
- { unit: 'ADA', quantity: '10' },
- { unit: 'USDC', quantity: '100' },
- { unit: 'ADA', quantity: '10' },
- ];
- value.addAssets(assets);
- // Assertions to verify the behavior of addAssets...
- expect(value.value).toEqual({ USDM: BigInt(100), ADA: BigInt(20), USDC: BigInt(100) });
- });
- });
- describe('negateAsset', () => {
- describe('negateAsset', () => {
- it('should subtract quantity from an existing asset', () => {
- const value = new Value();
- value.value = { ADA: 10n };
- value.negateAsset({ unit: 'ADA', quantity: '5' });
- expect(value.value).toEqual({ ADA: BigInt(5) });
- });
-
- it('should remove the asset if the resulting quantity is zero', () => {
- const value = new Value();
- value.value = { ADA: 10n };
- value.negateAsset({ unit: 'ADA', quantity: '10' });
- expect(value.value.ADA).toBeUndefined();
- });
-
- it('should allow negative quantity if the subtraction results in negative value', () => {
- const value = new Value();
- value.value = { ADA: 10n };
- value.negateAsset({ unit: 'ADA', quantity: '15' });
- expect(value.value).toEqual({ ADA: BigInt(-5) });
- });
-
- it('should add a new asset with negative quantity if the asset does not exist', () => {
- const value = new Value();
- value.negateAsset({ unit: 'ADA', quantity: '5' });
- expect(value.value).toEqual({ ADA: BigInt(-5) });
- });
- });
- });
- describe('negateAssets', () => {
- it('should subtract quantities from existing assets', () => {
- const value = new Value();
- value.value = { ADA: 20n, BTC: 10n };
- value.negateAssets([
- { unit: 'ADA', quantity: '5' },
- { unit: 'BTC', quantity: '3' },
- ]);
- expect(value.value).toEqual({ ADA: BigInt(15), BTC: BigInt(7) });
- });
-
- it('should remove the asset if the resulting quantity is zero', () => {
- const value = new Value();
- value.value = { ADA: 10n, BTC: 5n };
- value.negateAssets([
- { unit: 'ADA', quantity: '10' },
- { unit: 'BTC', quantity: '5' },
- ]);
- expect(value.value.ADA).toBeUndefined();
- expect(value.value.BTC).toBeUndefined();
- });
-
- it('should allow negative quantity if the subtraction results in negative value', () => {
- const value = new Value();
- value.value = { ADA: 10n, BTC: 5n };
- value.negateAssets([
- { unit: 'ADA', quantity: '15' },
- { unit: 'BTC', quantity: '10' },
- ]);
- expect(value.value).toEqual({ ADA: BigInt(-5), BTC: BigInt(-5) });
- });
-
- it('should add new assets with negative quantities if the assets do not exist', () => {
- const value = new Value();
- value.negateAssets([
- { unit: 'ADA', quantity: '5' },
- { unit: 'BTC', quantity: '3' },
- ]);
- expect(value.value).toEqual({ ADA: BigInt(-5), BTC: BigInt(-3) });
- });
-
- it('should handle a mix of existing and non-existing assets', () => {
- const value = new Value();
- value.value = { ADA: 10n };
- value.negateAssets([
- { unit: 'ADA', quantity: '5' },
- { unit: 'BTC', quantity: '3' },
- ]);
- expect(value.value).toEqual({ ADA: BigInt(5), BTC: BigInt(-3) });
- });
- });
- describe('get', () => {
- it('should return the quantity of an existing asset', () => {
- const value = new Value();
- value.value = { ADA: 20n, BTC: 10n };
- expect(value.get('ADA')).toEqual(BigInt(20));
- expect(value.get('BTC')).toEqual(BigInt(10));
- });
-
- it('should return 0 for a non-existing asset', () => {
- const value = new Value();
- value.value = { ADA: 20n };
- expect(value.get('BTC')).toEqual(BigInt(0));
- });
-
- it('should handle an empty value object', () => {
- const value = new Value();
- expect(value.get('ADA')).toEqual(BigInt(0));
- });
-
- it('should return the correct quantity after adding assets', () => {
- const value = new Value();
- value.value = { ADA: 20n };
- value.addAsset({ unit: 'BTC', quantity: '10' });
- expect(value.get('BTC')).toEqual(BigInt(10));
- });
-
- it('should return the correct quantity after subtracting assets', () => {
- const value = new Value();
- value.value = { ADA: 20n, BTC: 10n };
- value.negateAssets([{ unit: 'BTC', quantity: '5' }]);
- expect(value.get('BTC')).toEqual(BigInt(5));
- });
- });
- describe('units', () => {
- it('should return an empty object when value is empty', () => {
- const value = new Value();
- value.value = {};
- expect(value.units()).toEqual({});
- });
-
- it('should return the correct structure for a single asset', () => {
- const value = new Value();
- value.value = { ADA: 20n };
- expect(value.units()).toEqual({
- ADA: [{ unit: 'ADA', quantity: BigInt(20) }],
- });
- });
-
- it('should return the correct structure for multiple assets', () => {
- const value = new Value();
- value.value = { ADA: 20n, BTC: 10n };
- expect(value.units()).toEqual({
- ADA: [{ unit: 'ADA', quantity: BigInt(20) }],
- BTC: [{ unit: 'BTC', quantity: BigInt(10) }],
- });
- });
-
- it('should handle both positive and negative quantities correctly', () => {
- const value = new Value();
- value.value = { ADA: 20n, BTC: -10n };
- expect(value.units()).toEqual({
- ADA: [{ unit: 'ADA', quantity: BigInt(20) }],
- BTC: [{ unit: 'BTC', quantity: BigInt(-10) }],
- });
- });
- });
- describe('geq', () => {
- it('should return true if the value is greater than or equal to the target value for a specific unit', () => {
- const value = new Value();
- value.value = { ADA: 20n, BTC: 10n };
- const target = new Value();
- target.value = { ADA: 10n, BTC: 5n };
- expect(value.geq('ADA', target)).toBe(true);
- expect(value.geq('BTC', target)).toBe(true);
- });
-
- it('should return false if the value is less than the target value for a specific unit', () => {
- const value = new Value();
- value.value = { ADA: 20n, BTC: 10n };
- const target = new Value();
- target.value = { ADA: 30n, BTC: 15n };
- expect(value.geq('ADA', target)).toBe(false);
- expect(value.geq('BTC', target)).toBe(false);
- });
-
- it('should return true if the value is equal to the target value for a specific unit', () => {
- const value = new Value();
- value.value = { ADA: 20n, BTC: 10n };
- const target = new Value();
- target.value = { ADA: 20n, BTC: 10n };
- expect(value.geq('ADA', target)).toBe(true);
- expect(value.geq('BTC', target)).toBe(true);
- });
-
- it('should return false if the unit does not exist in value.value', () => {
- const value = new Value();
- value.value = { ADA: 20n, BTC: 10n };
- const target = new Value();
- target.value = { ETH: 5n };
- expect(value.geq('ETH', target)).toBe(false);
- });
- });
- describe('leq', () => {
- it('should return true if the value is less than or equal to the target value for a specific unit', () => {
- const value = new Value();
- value.value = { ADA: 20n, BTC: 10n };
- const target = new Value();
- target.value = { ADA: 30n, BTC: 15n };
- expect(value.leq('ADA', target)).toBe(true);
- expect(value.leq('BTC', target)).toBe(true);
- });
-
- it('should return false if the value is greater than the target value for a specific unit', () => {
- const value = new Value();
- value.value = { ADA: 20n, BTC: 10n };
- const target = new Value();
- target.value = { ADA: 10n, BTC: 5n };
- expect(value.leq('ADA', target)).toBe(false);
- expect(value.leq('BTC', target)).toBe(false);
- });
-
- it('should return true if the value is equal to the target value for a specific unit', () => {
- const value = new Value();
- value.value = { ADA: 20n, BTC: 10n };
- const target = new Value();
- target.value = { ADA: 20n, BTC: 10n };
- expect(value.leq('ADA', target)).toBe(true);
- expect(value.leq('BTC', target)).toBe(true);
- });
-
- it('should return false if the unit does not exist in value.value', () => {
- const value = new Value();
- value.value = { ADA: 20n, BTC: 10n };
- const target = new Value();
- target.value = { ETH: 5n };
- expect(value.leq('ETH', target)).toBe(false);
- });
- });
- describe('isEmpty', () => {
- it('should return true if the value is empty', () => {
- const value = new Value();
- value.value = {};
- expect(value.isEmpty()).toBe(true);
- });
-
- it('should return false if the value is not empty', () => {
- const value = new Value();
- value.value = { ADA: 20n };
- expect(value.isEmpty()).toBe(false);
- });
- });
- describe('merge', () => {
- it('should merge two values correctly', () => {
- const value1 = new Value();
- value1.value = { ADA: 20n, BTC: 10n };
- const value2 = new Value();
- value2.value = { ADA: 10n, BTC: 5n };
- expect(value1.merge(value2).value).toEqual({ ADA: 30n, BTC: 15n });
- });
-
- it('should merge two values correctly with different units', () => {
- const value1 = new Value();
- value1.value = { ADA: 20n, BTC: 10n };
- const value2 = new Value();
- value2.value = { ETH: 10n, BTC: 5n };
- expect(value1.merge(value2).value).toEqual({ ADA: 20n, BTC: 15n, ETH: 10n });
- });
-
- it('should merge two values correctly with negative quantities', () => {
- const value1 = new Value();
- value1.value = { ADA: 20n, BTC: -10n };
- const value2 = new Value();
- value2.value = { ADA: 10n, BTC: 5n };
- expect(value1.merge(value2).value).toEqual({ ADA: 30n, BTC: -5n });
- });
- });
-});
\ No newline at end of file
From 664b0ed96a449703f42a22754ce9289cd5679fae Mon Sep 17 00:00:00 2001
From: "Hong Jing (Jingles)"
Date: Sat, 3 Aug 2024 12:15:33 +0800
Subject: [PATCH 06/17] add metamask support, fixed giftcard, upgrade wallets
---
.../components/cardano/mint-mesh-token.tsx | 67 +++++++++++++++++
.../components/sections/live-code-demo.tsx | 17 +++--
.../sections/title-icon-description-body.tsx | 4 +-
.../wallets/browserwallet/connect-wallet.tsx | 2 +-
.../browserwallet/get-available-wallets.tsx | 75 +++++++++++++++++++
.../apis/wallets/browserwallet/index.tsx | 6 +-
.../pages/smart-contracts/escrow/index.tsx | 5 +-
.../pages/smart-contracts/giftcard/index.tsx | 2 +-
.../smart-contracts/marketplace/index.tsx | 5 +-
.../marketplace/list-asset.tsx | 1 +
.../payment-splitter/index.tsx | 2 +-
.../src/pages/smart-contracts/swap/index.tsx | 5 +-
.../pages/smart-contracts/vesting/index.tsx | 2 +-
package-lock.json | 65 ++++++++++++----
packages/mesh-contract/src/common.ts | 22 +++---
packages/mesh-contract/src/escrow/offchain.ts | 2 +-
.../mesh-contract/src/giftcard/offchain.ts | 16 +++-
.../mesh-contract/src/hello-world/offchain.ts | 2 +-
.../mesh-contract/src/marketplace/offchain.ts | 2 +-
packages/mesh-contract/src/swap/offchain.ts | 2 +-
.../mesh-contract/src/vesting/offchain.ts | 2 +-
.../mesh-react/src/cardano-wallet/index.tsx | 19 ++---
packages/mesh-react/src/common/button.tsx | 6 ++
.../mesh-react/src/hooks/useWalletList.ts | 5 +-
packages/mesh-wallet/package.json | 10 ++-
packages/mesh-wallet/src/browser/index.ts | 21 +++++-
packages/mesh-wallet/src/browser/metamask.ts | 42 +++++++++++
27 files changed, 340 insertions(+), 69 deletions(-)
create mode 100644 apps/playground/src/components/cardano/mint-mesh-token.tsx
create mode 100644 apps/playground/src/pages/apis/wallets/browserwallet/get-available-wallets.tsx
create mode 100644 packages/mesh-wallet/src/browser/metamask.ts
diff --git a/apps/playground/src/components/cardano/mint-mesh-token.tsx b/apps/playground/src/components/cardano/mint-mesh-token.tsx
new file mode 100644
index 00000000..85d7c601
--- /dev/null
+++ b/apps/playground/src/components/cardano/mint-mesh-token.tsx
@@ -0,0 +1,67 @@
+import {
+ AppWallet,
+ AssetMetadata,
+ ForgeScript,
+ Mint,
+ Transaction,
+} from "@meshsdk/core";
+import { useWallet } from "@meshsdk/react";
+
+import { demoAssetMetadata, demoMnemonic } from "~/data/cardano";
+import LiveCodeDemo from "../sections/live-code-demo";
+import { getProvider } from "./mesh-wallet";
+
+export default function MintMeshToken() {
+ const { wallet, connected } = useWallet();
+
+ async function runDemo() {
+ const blockchainProvider = getProvider();
+ const mintingWallet = new AppWallet({
+ networkId: 0,
+ fetcher: blockchainProvider,
+ submitter: blockchainProvider,
+ key: {
+ type: "mnemonic",
+ words: demoMnemonic,
+ },
+ });
+
+ const usedAddress = await wallet.getUsedAddresses();
+ const address = usedAddress[0];
+ const forgingScript = ForgeScript.withOneSignature(
+ mintingWallet.getPaymentAddress(),
+ );
+
+ const tx = new Transaction({ initiator: wallet });
+
+ const asset: Mint = {
+ assetName: "MeshToken",
+ assetQuantity: "1",
+ metadata: demoAssetMetadata,
+ label: "721",
+ recipient: address,
+ };
+ tx.mintAsset(forgingScript, asset);
+
+ const unsignedTx = await tx.build();
+ const signedTx = await wallet.signTx(unsignedTx, true);
+ const signedTx2 = await mintingWallet.signTx(signedTx, true);
+ const txHash = await wallet.submitTx(signedTx2);
+ return txHash;
+ }
+
+ return (
+
+ );
+}
diff --git a/apps/playground/src/components/sections/live-code-demo.tsx b/apps/playground/src/components/sections/live-code-demo.tsx
index 882f809c..9b8ecc52 100644
--- a/apps/playground/src/components/sections/live-code-demo.tsx
+++ b/apps/playground/src/components/sections/live-code-demo.tsx
@@ -23,6 +23,8 @@ export default function LiveCodeDemo({
runDemoShowBrowseWalletConnect = false,
runDemoShowProviderInit = false,
runDemoProvider = undefined,
+ hideDemoButtonIfnotConnected = false,
+ hideConnectButtonIfConnected = false,
}: {
children?: React.ReactNode;
title: string;
@@ -36,6 +38,8 @@ export default function LiveCodeDemo({
runDemoShowBrowseWalletConnect?: boolean;
runDemoShowProviderInit?: boolean;
runDemoProvider?: string | undefined;
+ hideDemoButtonIfnotConnected?: boolean;
+ hideConnectButtonIfConnected?: boolean;
}) {
const { connected } = useWallet();
const [loading, setLoading] = useState(false);
@@ -77,7 +81,7 @@ export default function LiveCodeDemo({
)}
- {runCodeFunction && (
+ {runCodeFunction && (connected || !hideDemoButtonIfnotConnected) && (
);
}
diff --git a/apps/playground/src/pages/apis/wallets/browserwallet/connect-wallet.tsx b/apps/playground/src/pages/apis/wallets/browserwallet/connect-wallet.tsx
index 6e2adf7b..40b35646 100644
--- a/apps/playground/src/pages/apis/wallets/browserwallet/connect-wallet.tsx
+++ b/apps/playground/src/pages/apis/wallets/browserwallet/connect-wallet.tsx
@@ -26,7 +26,7 @@ function Left() {
dApp to use.
- Query BrowserWallet.getInstalledWallets() to get a list of
+ Query BrowserWallet.getAvailableWallets() to get a list of
available wallets, then provide the wallet name for which
wallet the user would like to connect with.
diff --git a/apps/playground/src/pages/apis/wallets/browserwallet/get-available-wallets.tsx b/apps/playground/src/pages/apis/wallets/browserwallet/get-available-wallets.tsx
new file mode 100644
index 00000000..c0e9dbb2
--- /dev/null
+++ b/apps/playground/src/pages/apis/wallets/browserwallet/get-available-wallets.tsx
@@ -0,0 +1,75 @@
+import { BrowserWallet } from "@meshsdk/core";
+
+import LiveCodeDemo from "~/components/sections/live-code-demo";
+import TwoColumnsScroll from "~/components/sections/two-columns-scroll";
+import Codeblock from "~/components/text/codeblock";
+
+export default function BrowserWalletGetAvailableWallets() {
+ return (
+
+ );
+}
+
+function Left() {
+ let example = ``;
+ example += `[\n`;
+ example += ` {\n`;
+ example += ` "id": "nufiSnap",\n`;
+ example += ` "name": "MetaMask",\n`;
+ example += ` "icon": "data:image/svg+xml;base64,<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 28.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
	 viewBox="0 0 318.6 318.6" style="enable-background:new 0 0 318.6 318.6;" xml:space="preserve">
<style type="text/css">
	.st0{fill:#E2761B;stroke:#E2761B;stroke-linecap:round;stroke-linejoin:round;}
	.st1{fill:#E4761B;stroke:#E4761B;stroke-linecap:round;stroke-linejoin:round;}
	.st2{fill:#D7C1B3;stroke:#D7C1B3;stroke-linecap:round;stroke-linejoin:round;}
	.st3{fill:#233447;stroke:#233447;stroke-linecap:round;stroke-linejoin:round;}
	.st4{fill:#CD6116;stroke:#CD6116;stroke-linecap:round;stroke-linejoin:round;}
	.st5{fill:#E4751F;stroke:#E4751F;stroke-linecap:round;stroke-linejoin:round;}
	.st6{fill:#F6851B;stroke:#F6851B;stroke-linecap:round;stroke-linejoin:round;}
	.st7{fill:#C0AD9E;stroke:#C0AD9E;stroke-linecap:round;stroke-linejoin:round;}
	.st8{fill:#161616;stroke:#161616;stroke-linecap:round;stroke-linejoin:round;}
	.st9{fill:#763D16;stroke:#763D16;stroke-linecap:round;stroke-linejoin:round;}
	.st10{fill:#212121;}
	.st11{fill-rule:evenodd;clip-rule:evenodd;fill:#C6FF00;}
	.st12{fill:#0D1E30;}
	.st13{fill:#FFFFFF;}
</style>
<g id="Layer_1_00000092449601306522917240000007175848481355238535_">
	<path class="st0" d="M283.3,31.6l-107.5,79.8l19.9-47.1L283.3,31.6z"/>
	<path class="st1" d="M35.2,31.6l106.6,80.6l-18.9-47.9L35.2,31.6z M244.6,216.7L216,260.5l61.3,16.9l17.6-59.7L244.6,216.7z
		 M23.8,217.6l17.5,59.7l61.3-16.9L74,216.7L23.8,217.6z"/>
	<path class="st1" d="M99.1,142.6L82,168.4l60.8,2.7l-2.2-65.4L99.1,142.6z M219.4,142.6L177.2,105l-1.4,66.1l60.7-2.7L219.4,142.6z
		 M102.6,260.5l36.5-17.8l-31.5-24.6L102.6,260.5z M179.4,242.7l36.6,17.8l-5.1-42.5L179.4,242.7z"/>
	<path class="st2" d="M216,260.5l-36.6-17.8l2.9,23.9l-0.3,10L216,260.5z M102.6,260.5l34,16.1l-0.2-10l2.7-23.9L102.6,260.5z"/>
	<path class="st3" d="M137.2,202.3l-30.5-9l21.5-9.8L137.2,202.3z M181.3,202.3l9-18.8l21.6,9.8L181.3,202.3z"/>
	<path class="st4" d="M102.6,260.5l5.2-43.9l-33.8,1L102.6,260.5z M210.8,216.7l5.2,43.9l28.6-42.9L210.8,216.7z M236.5,168.4
		l-60.7,2.7l5.6,31.2l9-18.8l21.6,9.8L236.5,168.4z M106.7,193.3l21.6-9.8l8.9,18.8l5.7-31.2l-60.8-2.7L106.7,193.3z"/>
	<path class="st5" d="M82.1,168.4l25.5,49.7l-0.9-24.7L82.1,168.4z M212,193.3l-1.1,24.7l25.6-49.7L212,193.3z M142.9,171.1
		l-5.7,31.2l7.1,36.8l1.6-48.5L142.9,171.1z M175.8,171.1l-2.9,19.4l1.3,48.6l7.2-36.8L175.8,171.1z"/>
	<path class="st6" d="M181.4,202.3l-7.2,36.8l5.2,3.6l31.5-24.6l1.1-24.7L181.4,202.3z M106.7,193.3l0.9,24.7l31.5,24.6l5.2-3.6
		l-7.1-36.8L106.7,193.3z"/>
	<path class="st7" d="M182,276.6l0.3-10l-2.7-2.4h-40.7l-2.5,2.4l0.2,10l-34-16.1l11.9,9.7l24.1,16.7H180l24.2-16.7l11.9-9.7
		L182,276.6z"/>
	<path class="st8" d="M179.4,242.7l-5.2-3.6h-29.9l-5.2,3.6l-2.7,23.9l2.5-2.4h40.7l2.7,2.4L179.4,242.7z"/>
	<path class="st9" d="M287.9,116.6l9.2-44.1l-13.7-40.9l-103.9,77.1l40,33.8L276,159l12.5-14.6l-5.4-3.9l8.6-7.9l-6.7-5.2l8.6-6.6
		L287.9,116.6z M21.6,72.5l9.2,44.1l-5.8,4.3l8.6,6.6l-6.6,5.2l8.6,7.9l-5.4,3.9l12.4,14.6l56.5-16.5l40-33.8L35.2,31.6L21.6,72.5z"
		/>
	<path class="st6" d="M275.9,159.1l-56.5-16.5l17.2,25.8L211,218.1l33.7-0.4h50.2L275.9,159.1z M99.1,142.6l-56.5,16.5l-18.8,58.6
		H74l33.6,0.4l-25.5-49.7L99.1,142.6z M175.8,171.1l3.6-62.3l16.4-44.4h-72.9l16.2,44.4l3.8,62.3l1.3,19.7l0.1,48.4h29.9l0.2-48.4
		L175.8,171.1z"/>
</g>
<g id="Layer_2_00000018942647582559629790000004709545842779585935_">
	<path class="st10" d="M183.2,250.3c0-35.5,28.8-64.2,64.2-64.2c35.5,0,64.3,28.8,64.3,64.2c0,35.5-28.8,64.2-64.3,64.2
		S183.2,285.7,183.2,250.3z"/>
	<path class="st11" d="M247.4,308.5c27.2,0,50-18.8,56.2-44.3h-19.4c-5.6,15-20,25.6-36.8,25.6s-31.2-10.6-36.8-25.6h-19.4
		C197.4,289.6,220.2,308.5,247.4,308.5z M247.4,192c27.2,0,50,18.8,56.2,44.3h-19.4c-5.6-15-20-25.6-36.8-25.6s-31.2,10.6-36.8,25.6
		h-19.4C197.4,210.9,220.2,192,247.4,192z M237.2,236.3c-2,0-3.7,1.7-3.7,3.7v20.5c0,2.1,1.7,3.7,3.7,3.7h20.4c2,0,3.7-1.7,3.7-3.7
		V240c0-2.1-1.7-3.7-3.7-3.7H237.2z"/>
</g>
<path class="st12" d="M247.5,314.5c35.5,0,64.3-28.8,64.3-64.3c0-35.5-28.8-64.3-64.3-64.3c-35.5,0-64.3,28.8-64.3,64.3
	C183.2,285.7,212,314.5,247.5,314.5z"/>
<g>
	<path d="M246.3,210.3c1.9-1,4.3,1.3,3.3,3.2c-0.6,1.5-2.9,2-4,0.8C244.4,213.2,244.8,210.9,246.3,210.3L246.3,210.3z M225.6,212.5
		c1.2-0.5,2.7,0.6,2.5,1.8c0.1,1.4-1.6,2.4-2.8,1.7C223.8,215.5,224,212.9,225.6,212.5z M268.1,216.1c-1.8-0.2-2.1-3-0.4-3.6
		c1.4-0.7,2.6,0.6,2.8,1.8C270.2,215.4,269.3,216.4,268.1,216.1z M230.3,221.2c2-1.2,4.7,0.6,4.4,2.8c-0.1,2.3-3.1,3.6-4.9,2
		C228.3,224.9,228.5,222.1,230.3,221.2z M260.2,222.5c0.9-2.2,4.4-2.3,5.4-0.1c1,1.7-0.2,3.8-2,4.3
		C261.3,227.1,259.1,224.6,260.2,222.5z M243.9,226.5c0-1.9,1.7-3.3,3.6-3.5c1.2,0.2,2.5,0.8,3.1,2c1,1.7,0.1,4-1.6,4.7
		c-0.8,0.4-1.8,0.3-2.6,0.2C244.9,229.4,243.7,228.1,243.9,226.5z M213.1,229.3c1.8-1.1,4.2,0.9,3.5,2.8c-0.4,1.7-2.6,2.3-3.9,1.3
		C211.3,232.4,211.5,230,213.1,229.3L213.1,229.3z M279.2,229.3c1.5-1.2,4,0.2,3.8,2.1c0.1,1.7-2.1,3-3.6,2.1
		C277.8,232.8,277.6,230.2,279.2,229.3L279.2,229.3z M252.5,232.7c2.5-0.9,5.5,0.2,6.9,2.4c1.9,2.7,0.9,6.8-2,8.3
		c-3,1.8-7.4,0.3-8.6-3C247.5,237.4,249.4,233.7,252.5,232.7L252.5,232.7z M237.8,233c2.8-1.3,6.5-0.2,7.8,2.6
		c1.6,2.7,0.4,6.5-2.5,7.9c-2.8,1.6-6.8,0.4-8.2-2.5C233.5,238.1,234.9,234.3,237.8,233z M223.1,238c0.2-1.8,1.9-2.9,3.6-3
		c0.9,0.1,1.7,0.5,2.3,1.1c0.6,0.6,1,1.4,1.1,2.3c-0.1,1.8-1.5,3.6-3.5,3.6C224.6,242.1,222.7,240,223.1,238z M266.5,235.3
		c2.2-1.3,5.2,0.6,5.2,3.1c0.1,2.6-3.2,4.5-5.4,2.9C264,240,264.2,236.4,266.5,235.3z M231.9,244.6c2.6-0.7,5.5,0.5,6.8,2.8
		c1.4,2.3,0.8,5.6-1.3,7.3c-2.8,2.5-7.8,1.5-9.3-1.9C226.3,249.6,228.4,245.4,231.9,244.6L231.9,244.6z M259.7,244.6
		c2.5-0.7,5.4,0.2,6.8,2.5c1.8,2.6,0.9,6.4-1.7,8c-2.8,1.9-7.1,0.9-8.6-2.1C254.3,249.9,256.2,245.5,259.7,244.6z M215.3,247.5
		c2.2-0.8,4.7,1.6,3.8,3.7c-0.5,2-3.4,2.7-4.8,1.2C212.6,251.1,213.2,248.1,215.3,247.5z M275.5,250.6c0-0.9,0.3-1.7,0.9-2.4
		c0.6-0.7,1.4-1.1,2.3-1.1c1.5,0.2,3,1.4,2.9,3.1c0.1,2.1-2.5,3.6-4.4,2.6C276.3,252.4,275.9,251.5,275.5,250.6z M204.4,248.6
		c1.3-0.6,3,0.6,2.7,2c-0.1,1.7-2.6,2.3-3.5,0.9C202.9,250.5,203.3,249.1,204.4,248.6L204.4,248.6z M288.6,248.5
		c0.9-0.7,2.5-0.2,2.8,0.9c0.6,1.2-0.5,2.8-1.9,2.6C287.6,252.2,287,249.4,288.6,248.5z M239.1,256.5c3.5-0.9,7.3,2,7.3,5.5
		c0.2,3.6-3.5,6.8-7.1,6c-2.8-0.4-5-3.1-4.9-5.8C234.5,259.5,236.5,257,239.1,256.5z M253,256.4c3.6-1,7.5,2,7.4,5.6
		c0.2,3.5-3.4,6.6-6.9,5.9c-3.3-0.4-5.8-4-4.8-7.2C249.1,258.7,250.9,257,253,256.4L253,256.4z M226.2,258.6
		c2.5-0.4,4.8,2.3,3.8,4.6c-0.7,2.5-4.4,3.1-6,1.1C222.1,262.4,223.5,258.9,226.2,258.6z M267,258.7c2.2-0.9,4.9,1,4.7,3.3
		c0.1,2.6-3.2,4.4-5.4,2.9C263.9,263.6,264.3,259.6,267,258.7z M278.4,270c-0.9-1.6,0.7-3.7,2.5-3.4c0.9,0,1.5,0.7,2.1,1.2
		c0.1,0.9,0.3,2.1-0.5,2.8C281.4,272,279,271.6,278.4,270z M213,267.1c1.7-1.1,4.1,0.5,3.7,2.5c-0.2,1.7-2.4,2.7-3.8,1.7
		C211.4,270.3,211.5,267.8,213,267.1z M246,270.6c2.2-0.9,5,0.9,4.8,3.3c0.2,2.6-3.3,4.4-5.4,2.9C242.9,275.4,243.3,271.4,246,270.6
		z M230.7,274.1c1.9-1,4.3,0.7,4.2,2.7c0.1,1.7-1.6,3.1-3.3,2.9c-1.4,0-2.3-1.3-2.8-2.4C228.9,276,229.4,274.6,230.7,274.1
		L230.7,274.1z M261.6,274.1c1.9-1.2,4.6,0.5,4.4,2.7c0,2.3-3,3.8-4.8,2.2C259.5,277.9,259.7,275.1,261.6,274.1z M267,287.2
		c-0.9-1.3,0.1-2.8,1.5-3.1c1.1,0.2,2.3,1,2.1,2.3C270.4,288.1,267.8,288.7,267,287.2L267,287.2z M224.3,286.1c0.3-1,1.2-2,2.4-1.7
		c1.7,0.1,2.3,2.7,0.7,3.5C226.1,288.8,224.5,287.5,224.3,286.1z M244.9,287.2c0.3-1.5,2.3-2.2,3.6-1.4c0.9,0.4,1.1,1.3,1.3,2.1
		c-0.1,0.4-0.2,0.8-0.3,1.2c-0.5,0.6-1.2,1.2-2.1,1.2C245.8,290.6,244.3,288.7,244.9,287.2L244.9,287.2z"/>
</g>
<path class="st13" d="M246.3,210.3c1.9-1,4.3,1.3,3.3,3.2c-0.6,1.5-2.9,2-4,0.8C244.4,213.2,244.8,210.9,246.3,210.3L246.3,210.3z
	 M225.6,212.5c1.2-0.5,2.7,0.6,2.5,1.8c0.1,1.4-1.6,2.4-2.8,1.7C223.8,215.5,224,212.9,225.6,212.5z M268.1,216.1
	c-1.8-0.2-2.1-3-0.4-3.6c1.4-0.7,2.6,0.6,2.8,1.8C270.2,215.4,269.3,216.4,268.1,216.1z M230.3,221.2c2-1.2,4.7,0.6,4.4,2.8
	c-0.1,2.3-3.1,3.6-4.9,2C228.3,224.9,228.5,222.1,230.3,221.2z M260.2,222.5c0.9-2.2,4.4-2.3,5.4-0.1c1,1.7-0.2,3.8-2,4.3
	C261.3,227.1,259.1,224.6,260.2,222.5z M243.9,226.5c0-1.9,1.7-3.3,3.6-3.5c1.2,0.2,2.5,0.8,3.1,2c1,1.7,0.1,4-1.6,4.7
	c-0.8,0.4-1.8,0.3-2.6,0.2C244.9,229.4,243.7,228.1,243.9,226.5z M213.1,229.3c1.8-1.1,4.2,0.9,3.5,2.8c-0.4,1.7-2.6,2.3-3.9,1.3
	C211.3,232.4,211.5,230,213.1,229.3L213.1,229.3z M279.2,229.3c1.5-1.2,4,0.2,3.8,2.1c0.1,1.7-2.1,3-3.6,2.1
	C277.8,232.8,277.6,230.2,279.2,229.3L279.2,229.3z M252.5,232.7c2.5-0.9,5.5,0.2,6.9,2.4c1.9,2.7,0.9,6.8-2,8.3
	c-3,1.8-7.4,0.3-8.6-3C247.5,237.4,249.4,233.7,252.5,232.7L252.5,232.7z M237.8,233c2.8-1.3,6.5-0.2,7.8,2.6
	c1.6,2.7,0.4,6.5-2.5,7.9c-2.8,1.6-6.8,0.4-8.2-2.5C233.5,238.1,234.9,234.3,237.8,233z M223.1,238c0.2-1.8,1.9-2.9,3.6-3
	c0.9,0.1,1.7,0.5,2.3,1.1c0.6,0.6,1,1.4,1.1,2.3c-0.1,1.8-1.5,3.6-3.5,3.6C224.6,242.1,222.7,240,223.1,238z M266.5,235.3
	c2.2-1.3,5.2,0.6,5.2,3.1c0.1,2.6-3.2,4.5-5.4,2.9C264,240,264.2,236.4,266.5,235.3z M231.9,244.6c2.6-0.7,5.5,0.5,6.8,2.8
	c1.4,2.3,0.8,5.6-1.3,7.3c-2.8,2.5-7.8,1.5-9.3-1.9C226.3,249.6,228.4,245.4,231.9,244.6L231.9,244.6z M259.7,244.6
	c2.5-0.7,5.4,0.2,6.8,2.5c1.8,2.6,0.9,6.4-1.7,8c-2.8,1.9-7.1,0.9-8.6-2.1C254.3,249.9,256.2,245.5,259.7,244.6z M215.3,247.5
	c2.2-0.8,4.7,1.6,3.8,3.7c-0.5,2-3.4,2.7-4.8,1.2C212.6,251.1,213.2,248.1,215.3,247.5z M275.5,250.6c0-0.9,0.3-1.7,0.9-2.4
	c0.6-0.7,1.4-1.1,2.3-1.1c1.5,0.2,3,1.4,2.9,3.1c0.1,2.1-2.5,3.6-4.4,2.6C276.3,252.4,275.9,251.5,275.5,250.6z M204.4,248.6
	c1.3-0.6,3,0.6,2.7,2c-0.1,1.7-2.6,2.3-3.5,0.9C202.9,250.5,203.3,249.1,204.4,248.6L204.4,248.6z M288.6,248.5
	c0.9-0.7,2.5-0.2,2.8,0.9c0.6,1.2-0.5,2.8-1.9,2.6C287.6,252.2,287,249.4,288.6,248.5z M239.1,256.5c3.5-0.9,7.3,2,7.3,5.5
	c0.2,3.6-3.5,6.8-7.1,6c-2.8-0.4-5-3.1-4.9-5.8C234.5,259.5,236.5,257,239.1,256.5z M253,256.4c3.6-1,7.5,2,7.4,5.6
	c0.2,3.5-3.4,6.6-6.9,5.9c-3.3-0.4-5.8-4-4.8-7.2C249.1,258.7,250.9,257,253,256.4L253,256.4z M226.2,258.6c2.5-0.4,4.8,2.3,3.8,4.6
	c-0.7,2.5-4.4,3.1-6,1.1C222.1,262.4,223.5,258.9,226.2,258.6z M267,258.7c2.2-0.9,4.9,1,4.7,3.3c0.1,2.6-3.2,4.4-5.4,2.9
	C263.9,263.6,264.3,259.6,267,258.7z M278.4,270c-0.9-1.6,0.7-3.7,2.5-3.4c0.9,0,1.5,0.7,2.1,1.2c0.1,0.9,0.3,2.1-0.5,2.8
	C281.4,272,279,271.6,278.4,270z M213,267.1c1.7-1.1,4.1,0.5,3.7,2.5c-0.2,1.7-2.4,2.7-3.8,1.7C211.4,270.3,211.5,267.8,213,267.1z
	 M246,270.6c2.2-0.9,5,0.9,4.8,3.3c0.2,2.6-3.3,4.4-5.4,2.9C242.9,275.4,243.3,271.4,246,270.6z M230.7,274.1c1.9-1,4.3,0.7,4.2,2.7
	c0.1,1.7-1.6,3.1-3.3,2.9c-1.4,0-2.3-1.3-2.8-2.4C228.9,276,229.4,274.6,230.7,274.1L230.7,274.1z M261.6,274.1
	c1.9-1.2,4.6,0.5,4.4,2.7c0,2.3-3,3.8-4.8,2.2C259.5,277.9,259.7,275.1,261.6,274.1z M267,287.2c-0.9-1.3,0.1-2.8,1.5-3.1
	c1.1,0.2,2.3,1,2.1,2.3C270.4,288.1,267.8,288.7,267,287.2L267,287.2z M224.3,286.1c0.3-1,1.2-2,2.4-1.7c1.7,0.1,2.3,2.7,0.7,3.5
	C226.1,288.8,224.5,287.5,224.3,286.1z M244.9,287.2c0.3-1.5,2.3-2.2,3.6-1.4c0.9,0.4,1.1,1.3,1.3,2.1c-0.1,0.4-0.2,0.8-0.3,1.2
	c-0.5,0.6-1.2,1.2-2.1,1.2C245.8,290.6,244.3,288.7,244.9,287.2L244.9,287.2z"/>
</svg>
",\n`;
+ example += ` "version": "1.1.0"\n`;
+ example += ` },\n`;
+ example += ` {\n`;
+ example += ` "name": "eternl",\n`;
+ example += ` "icon": "data:image/png;base64,ICONBASE64HERE=",\n`;
+ example += ` "version": "0.1.0"\n`;
+ example += ` }\n`;
+ example += `]\n`;
+
+ return (
+ <>
+
+ Returns a list of wallets available on user's device. Each wallet is an
+ object with the following properties:
+
+
+
+ A name is provided to display wallet's name on the user interface.
+
+
+ A version is provided to display wallet's version on the user
+ interface.
+
+
+ An icon is provided to display wallet's icon on the user interface.
+
+
+
Example:
+
+ >
+ );
+}
+
+function Right() {
+ async function runDemo() {
+ return await BrowserWallet.getAvailableWallets();
+ }
+
+ let codeSnippet = "";
+ codeSnippet += `import { BrowserWallet } from '@meshsdk/core';\n\n`;
+ codeSnippet += `const wallets = await BrowserWallet.getAvailableWallets()`;
+
+ return (
+
+ );
+}
diff --git a/apps/playground/src/pages/apis/wallets/browserwallet/index.tsx b/apps/playground/src/pages/apis/wallets/browserwallet/index.tsx
index 935ef35d..4ab9b7bf 100644
--- a/apps/playground/src/pages/apis/wallets/browserwallet/index.tsx
+++ b/apps/playground/src/pages/apis/wallets/browserwallet/index.tsx
@@ -7,10 +7,10 @@ import Metatags from "~/components/site/metatags";
import { metaBrowserwallet } from "~/data/links-wallets";
import BrowserWalletConnectWallet from "./connect-wallet";
import BrowserWalletGetAssets from "./get-assets";
+import BrowserWalletGetAvailableWallets from "./get-available-wallets";
import BrowserWalletGetBalance from "./get-balance";
import BrowserWalletGetChangeAddress from "./get-change-address";
import BrowserWalletGetCollateral from "./get-collateral";
-import BrowserWalletGetInstalledWallets from "./get-installed-wallets";
import BrowserWalletGetLovelace from "./get-lovelace";
import BrowserWalletGetNetworkId from "./get-networkid";
import BrowserWalletGetPolicyIdAssets from "./get-policyid-assets";
@@ -25,7 +25,7 @@ import BrowserWalletSubmitTransaction from "./submit-tx";
const ReactPage: NextPage = () => {
const sidebarItems = [
- { label: "Get installed wallets", to: "getInstallWallets" },
+ { label: "Get available wallets", to: "getAvailableWallets" },
{ label: "Connect wallet", to: "connectWallet" },
{ label: "Get balance", to: "getBalance" },
{ label: "Get change address", to: "getChangeAddress" },
@@ -76,7 +76,7 @@ const ReactPage: NextPage = () => {
-
+
diff --git a/apps/playground/src/pages/smart-contracts/escrow/index.tsx b/apps/playground/src/pages/smart-contracts/escrow/index.tsx
index 79e1444c..a9928c5e 100644
--- a/apps/playground/src/pages/smart-contracts/escrow/index.tsx
+++ b/apps/playground/src/pages/smart-contracts/escrow/index.tsx
@@ -1,6 +1,7 @@
import type { NextPage } from "next";
import Link from "next/link";
+import MintMeshToken from "~/components/cardano/mint-mesh-token";
import SidebarFullwidth from "~/components/layouts/sidebar-fullwidth";
import TitleIconDescriptionBody from "~/components/sections/title-icon-description-body";
import Metatags from "~/components/site/metatags";
@@ -76,11 +77,13 @@ const ReactPage: NextPage = () => {
Both on-chain and off-chain codes are open-source and available on{" "}
-
+
Mesh Github Repository
.
Both on-chain and off-chain codes are open-source and available on{" "}
-
+
Mesh Github Repository
.
diff --git a/apps/playground/src/pages/smart-contracts/marketplace/index.tsx b/apps/playground/src/pages/smart-contracts/marketplace/index.tsx
index 7caf6d36..917cb6fa 100644
--- a/apps/playground/src/pages/smart-contracts/marketplace/index.tsx
+++ b/apps/playground/src/pages/smart-contracts/marketplace/index.tsx
@@ -1,6 +1,7 @@
import type { NextPage } from "next";
import Link from "next/link";
+import MintMeshToken from "~/components/cardano/mint-mesh-token";
import SidebarFullwidth from "~/components/layouts/sidebar-fullwidth";
import TitleIconDescriptionBody from "~/components/sections/title-icon-description-body";
import Metatags from "~/components/site/metatags";
@@ -102,11 +103,13 @@ const ReactPage: NextPage = () => {
Both on-chain and off-chain codes are open-source and available on{" "}
-
+
Mesh Github Repository
.
+
+
>
diff --git a/apps/playground/src/pages/smart-contracts/marketplace/list-asset.tsx b/apps/playground/src/pages/smart-contracts/marketplace/list-asset.tsx
index aa7c5107..53d50d00 100644
--- a/apps/playground/src/pages/smart-contracts/marketplace/list-asset.tsx
+++ b/apps/playground/src/pages/smart-contracts/marketplace/list-asset.tsx
@@ -2,6 +2,7 @@ import { useState } from "react";
import { useWallet } from "@meshsdk/react";
+import MintMeshToken from "~/components/cardano/mint-mesh-token";
import Input from "~/components/form/input";
import InputTable from "~/components/sections/input-table";
import LiveCodeDemo from "~/components/sections/live-code-demo";
diff --git a/apps/playground/src/pages/smart-contracts/payment-splitter/index.tsx b/apps/playground/src/pages/smart-contracts/payment-splitter/index.tsx
index 8d68e67c..f1c2f7de 100644
--- a/apps/playground/src/pages/smart-contracts/payment-splitter/index.tsx
+++ b/apps/playground/src/pages/smart-contracts/payment-splitter/index.tsx
@@ -95,7 +95,7 @@ const ReactPage: NextPage = () => {
Both on-chain and off-chain codes are open-source and available on{" "}
-
+
Mesh Github Repository
.
diff --git a/apps/playground/src/pages/smart-contracts/swap/index.tsx b/apps/playground/src/pages/smart-contracts/swap/index.tsx
index 968da425..4e386a3a 100644
--- a/apps/playground/src/pages/smart-contracts/swap/index.tsx
+++ b/apps/playground/src/pages/smart-contracts/swap/index.tsx
@@ -1,6 +1,7 @@
import type { NextPage } from "next";
import Link from "next/link";
+import MintMeshToken from "~/components/cardano/mint-mesh-token";
import SidebarFullwidth from "~/components/layouts/sidebar-fullwidth";
import TitleIconDescriptionBody from "~/components/sections/title-icon-description-body";
import Metatags from "~/components/site/metatags";
@@ -76,11 +77,13 @@ const ReactPage: NextPage = () => {
Both on-chain and off-chain codes are open-source and available on{" "}
-
+
Mesh Github Repository
.