From 137d72cab5a35a3c67d39ae76f828a530eddfc55 Mon Sep 17 00:00:00 2001 From: "Hong Jing (Jingles)" Date: Mon, 19 Aug 2024 19:25:23 +0800 Subject: [PATCH 1/2] fix errors --- .../src/pages/apis/data/value/accessor.tsx | 2 +- .../src/pages/apis/data/value/common.ts | 4 --- .../src/pages/apis/data/value/comparator.tsx | 24 +----------------- .../src/pages/apis/data/value/convertor.tsx | 11 +------- .../src/pages/apis/data/value/index.tsx | 5 ++++ .../src/pages/apis/data/value/operators.tsx | 25 ++----------------- package-lock.json | 19 +++++++++++--- 7 files changed, 25 insertions(+), 65 deletions(-) delete mode 100644 apps/playground/src/pages/apis/data/value/common.ts diff --git a/apps/playground/src/pages/apis/data/value/accessor.tsx b/apps/playground/src/pages/apis/data/value/accessor.tsx index b4187162..dfebc744 100644 --- a/apps/playground/src/pages/apis/data/value/accessor.tsx +++ b/apps/playground/src/pages/apis/data/value/accessor.tsx @@ -2,7 +2,7 @@ import { MeshValue } from "@meshsdk/common"; import LiveCodeDemo from "~/components/sections/live-code-demo"; import TwoColumnsScroll from "~/components/sections/two-columns-scroll"; -import { mockUnit } from "./common"; +import { mockUnit } from "./"; export default function ValueAccessor() { return ( diff --git a/apps/playground/src/pages/apis/data/value/common.ts b/apps/playground/src/pages/apis/data/value/common.ts deleted file mode 100644 index 8c531bda..00000000 --- a/apps/playground/src/pages/apis/data/value/common.ts +++ /dev/null @@ -1,4 +0,0 @@ -export const mockPolicyId = - "c21d710605bb00e69f3c175150552fc498316d80e7efdb1b186db38c"; -export const mockAssetName = "000643b04d65736820676f6f64"; -export const mockUnit = mockPolicyId + mockAssetName; diff --git a/apps/playground/src/pages/apis/data/value/comparator.tsx b/apps/playground/src/pages/apis/data/value/comparator.tsx index 2287154b..cfbf70fb 100644 --- a/apps/playground/src/pages/apis/data/value/comparator.tsx +++ b/apps/playground/src/pages/apis/data/value/comparator.tsx @@ -1,29 +1,7 @@ -import { - Asset, - byteString, - dict, - Dict, - Integer, - integer, - MeshValue, - MValue, - mValue, - Value, - value, -} from "@meshsdk/common"; -import { - assocMap, - AssocMap, - CurrencySymbol, - currencySymbol, - mBool, - TokenName, - tokenName, -} from "@meshsdk/core"; +import { MeshValue } from "@meshsdk/common"; import LiveCodeDemo from "~/components/sections/live-code-demo"; import TwoColumnsScroll from "~/components/sections/two-columns-scroll"; -import { mockUnit } from "./common"; export default function ValueComparator() { return ( diff --git a/apps/playground/src/pages/apis/data/value/convertor.tsx b/apps/playground/src/pages/apis/data/value/convertor.tsx index b0c89600..e62b2e2b 100644 --- a/apps/playground/src/pages/apis/data/value/convertor.tsx +++ b/apps/playground/src/pages/apis/data/value/convertor.tsx @@ -11,19 +11,10 @@ import { Value, value, } from "@meshsdk/common"; -import { - assocMap, - AssocMap, - CurrencySymbol, - currencySymbol, - mBool, - TokenName, - tokenName, -} from "@meshsdk/core"; +import { assocMap, currencySymbol, tokenName } from "@meshsdk/core"; import LiveCodeDemo from "~/components/sections/live-code-demo"; import TwoColumnsScroll from "~/components/sections/two-columns-scroll"; -import { mockUnit } from "./common"; export default function ValueConvertor() { return ( diff --git a/apps/playground/src/pages/apis/data/value/index.tsx b/apps/playground/src/pages/apis/data/value/index.tsx index 1a60aa1e..94beffaa 100644 --- a/apps/playground/src/pages/apis/data/value/index.tsx +++ b/apps/playground/src/pages/apis/data/value/index.tsx @@ -112,3 +112,8 @@ const ReactPage: NextPage = () => { }; export default ReactPage; + +export const mockPolicyId = + "c21d710605bb00e69f3c175150552fc498316d80e7efdb1b186db38c"; +export const mockAssetName = "000643b04d65736820676f6f64"; +export const mockUnit = mockPolicyId + mockAssetName; diff --git a/apps/playground/src/pages/apis/data/value/operators.tsx b/apps/playground/src/pages/apis/data/value/operators.tsx index e019d34b..24687ec0 100644 --- a/apps/playground/src/pages/apis/data/value/operators.tsx +++ b/apps/playground/src/pages/apis/data/value/operators.tsx @@ -1,29 +1,8 @@ -import { - Asset, - byteString, - dict, - Dict, - Integer, - integer, - MeshValue, - MValue, - mValue, - Value, - value, -} from "@meshsdk/common"; -import { - assocMap, - AssocMap, - CurrencySymbol, - currencySymbol, - mBool, - TokenName, - tokenName, -} from "@meshsdk/core"; +import { Asset, MeshValue } from "@meshsdk/common"; import LiveCodeDemo from "~/components/sections/live-code-demo"; import TwoColumnsScroll from "~/components/sections/two-columns-scroll"; -import { mockUnit } from "./common"; +import { mockUnit } from "./"; export default function ValueOperator() { return ( diff --git a/package-lock.json b/package-lock.json index d8fd1b34..bea42815 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8884,6 +8884,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", @@ -11942,7 +11943,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", @@ -14771,6 +14773,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", @@ -14782,6 +14785,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" } @@ -19003,6 +19007,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" @@ -19011,12 +19016,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" @@ -19025,7 +19032,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", @@ -20623,6 +20631,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" @@ -20978,6 +20987,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" @@ -20989,7 +20999,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", From a8f25ffe563eb29760d5ca093a0bb6abead2a963 Mon Sep 17 00:00:00 2001 From: "Hong Jing (Jingles)" Date: Mon, 19 Aug 2024 19:31:20 +0800 Subject: [PATCH 2/2] add vesting docs --- .../smart-contracts/vesting/deposit-fund.tsx | 19 +++++++++++++++++++ .../smart-contracts/vesting/withdraw-fund.tsx | 4 ++++ 2 files changed, 23 insertions(+) diff --git a/apps/playground/src/pages/smart-contracts/vesting/deposit-fund.tsx b/apps/playground/src/pages/smart-contracts/vesting/deposit-fund.tsx index 6dad39be..4a48f437 100644 --- a/apps/playground/src/pages/smart-contracts/vesting/deposit-fund.tsx +++ b/apps/playground/src/pages/smart-contracts/vesting/deposit-fund.tsx @@ -72,6 +72,25 @@ function Right() { } let code = ``; + code += `const assets: Asset[] = [\n`; + code += ` {\n`; + code += ` unit: "lovelace",\n`; + code += ` quantity: '${userInput}',\n`; + code += ` },\n`; + code += `];\n`; + code += `\n`; + code += `const lockUntilTimeStamp = new Date();\n`; + code += `lockUntilTimeStamp.setMinutes(lockUntilTimeStamp.getMinutes() + 1);\n`; + code += `\n`; + code += `const beneficiary = '${userInput2}';\n`; + code += `\n`; + code += `const tx = await contract.depositFund(\n`; + code += ` assets,\n`; + code += ` lockUntilTimeStamp.getTime(),\n`; + code += ` beneficiary,\n`; + code += `);\n`; + code += `const signedTx = await wallet.signTx(tx);\n`; + code += `const txHash = await wallet.submitTx(signedTx);\n`; return (