Skip to content

Commit

Permalink
Merge pull request #251 from MeshJS/v1.6.2
Browse files Browse the repository at this point in the history
v1.6.2
  • Loading branch information
jinglescode authored Aug 3, 2024
2 parents 00f84be + 688c34b commit 8d89257
Show file tree
Hide file tree
Showing 140 changed files with 3,321 additions and 995 deletions.
2 changes: 1 addition & 1 deletion apps/docs/src/app/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export default async function RootLayout({
params: { package: string };
}) {
// const {currentRoute} = useRouteContext();
// console.log(2, currentRoute)

// let pages = await glob('**/*.mdx', { cwd: 'src/app' })
// let allSectionsEntries = (await Promise.all(
// pages.map(async (filename) => [
Expand Down
15 changes: 5 additions & 10 deletions apps/docs/src/app/page.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { CodeGroup } from '@/components/Code';
import { Prose } from '@/components/Prose';
import Markdown from 'react-markdown';
import { CodeGroup } from "@/components/Code";
import { Prose } from "@/components/Prose";
import Markdown from "react-markdown";

export default function Home() {
return (
Expand Down Expand Up @@ -35,8 +35,8 @@ export default function Home() {
Mesh with npm:
</p>

<CodeGroup title="" code={`npm install @meshsdk/core @meshsdk/react`}>
<Markdown>npm install @meshsdk/core @meshsdk/react</Markdown>
<CodeGroup title="" code={`npm install @meshsdk/core`}>
<Markdown>npm install @meshsdk/core</Markdown>
</CodeGroup>

{/* <Resources /> */}
Expand All @@ -63,7 +63,6 @@ export default function Home() {

// useEffect(() => {
// const searchClasses = getClasses().map((meshClass: any) => {
// console.log(11, meshClass);

// const _object: any = { url: `/classes/${meshClass.name}`, sections: [] };

Expand All @@ -75,17 +74,14 @@ export default function Home() {

// _sections.push(_section);

// console.log(11, _section);

// getClassGroups(meshClass.name).map((group: any) => {
// group.children.map((item: any) => {
// console.log(22, item);

// item.signatures?.map((signature: any) => {
// const _sectionComments = getSectionComments(signature);
// const _section = [item.name, item.name, _sectionComments];
// _sections.push(_section);
// console.log(33, _section);
// });
// });
// });
Expand All @@ -95,5 +91,4 @@ export default function Home() {
// return _object;
// });

// console.log(99, JSON.stringify(searchClasses))
// }, []);
3 changes: 3 additions & 0 deletions apps/playground/src/components/cardano/fetch-utxo-by-datum.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,13 @@ export async function fetchAssetUtxo({
}) {
const blockchainProvider = getProvider();
const utxos = await blockchainProvider.fetchAddressUTxOs(address, asset);
console.log("utxos", utxos);

const dataHash = resolveDataHash(datum);

let utxo = utxos.find((utxo: any) => {
return utxo.output.dataHash == dataHash;
});
console.log("utxo", utxo);
return utxo;
}
1 change: 0 additions & 1 deletion apps/playground/src/components/cardano/mesh-wallet.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ export function getProvider(network = "preprod") {

export function getMeshWallet() {
const blockchainProvider = getProvider();

const wallet = new MeshWallet({
networkId: 0,
fetcher: blockchainProvider,
Expand Down
61 changes: 61 additions & 0 deletions apps/playground/src/components/cardano/mint-mesh-token.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
import { MeshWallet, 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 MeshWallet({
networkId: 0,
fetcher: blockchainProvider,
submitter: blockchainProvider,
key: {
type: "mnemonic",
words: demoMnemonic,
},
});
const forgingScript = ForgeScript.withOneSignature(
mintingWallet.getChangeAddress(),
);

const usedAddress = await wallet.getUsedAddresses();
const address = usedAddress[0];

const asset: Mint = {
assetName: "MeshToken",
assetQuantity: "1",
metadata: demoAssetMetadata,
label: "721",
recipient: address,
};

const tx = new Transaction({ initiator: wallet });
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 (
<LiveCodeDemo
title="Mint Mesh Token"
subtitle="Mint a Mesh Token to try demos"
runCodeFunction={runDemo}
disabled={!connected}
runDemoButtonTooltip={
!connected ? "Connect wallet to run this demo" : undefined
}
runDemoShowBrowseWalletConnect={true}
hideDemoButtonIfnotConnected={true}
hideConnectButtonIfConnected={true}
></LiveCodeDemo>
);
}
17 changes: 11 additions & 6 deletions apps/playground/src/components/sections/live-code-demo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ export default function LiveCodeDemo({
runDemoShowBrowseWalletConnect = false,
runDemoShowProviderInit = false,
runDemoProvider = undefined,
hideDemoButtonIfnotConnected = false,
hideConnectButtonIfConnected = false,
}: {
children?: React.ReactNode;
title: string;
Expand All @@ -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<boolean>(false);
Expand Down Expand Up @@ -77,7 +81,7 @@ export default function LiveCodeDemo({
<BlockchainProviderKey provider={runDemoProvider} />
)}

{runCodeFunction && (
{runCodeFunction && (connected || !hideDemoButtonIfnotConnected) && (
<div>
<RunDemoButton
runFunction={runDemo}
Expand All @@ -96,11 +100,12 @@ export default function LiveCodeDemo({
<DemoResult response={responseError} label="Error" />
</div>
)}
{runDemoShowBrowseWalletConnect && (
<div>
<ConnectBrowserWallet />
</div>
)}
{runDemoShowBrowseWalletConnect &&
(!connected || !hideConnectButtonIfConnected) && (
<div>
<ConnectBrowserWallet />
</div>
)}

{children && childrenAfterCodeFunctions && (
<div className="mb-4">{children}</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ export default function TitleIconDescriptionBody({
heroicon?: any;
}) {
return (
<>
<div className="mb-8">
<div className="mb-4 lg:mb-6">
<Header2 heroicon={heroicon}>{title}</Header2>
{description && <Paragraph2>{description}</Paragraph2>}
</div>
<div className="max-w-screen-lg">{children}</div>
</>
</div>
);
}
1 change: 1 addition & 0 deletions apps/playground/src/contexts/mesh-wallet.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ export const MeshWalletProvider = ({
if (!walletConnected) {
const _wallet = getMeshWallet();
setWallet(_wallet);
return _wallet;
}
return wallet;
}
Expand Down
4 changes: 2 additions & 2 deletions apps/playground/src/data/links-api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
6 changes: 3 additions & 3 deletions apps/playground/src/data/links-txbuilders.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ export const metaTxbuilderStaking = {

export const linksTxbuilder = [
metaTxbuilderBasic,
metaTxbuilderMinting,
metaTxbuilderSmartContract,
metaTxbuilderStaking,
// metaTxbuilderMinting,
// metaTxbuilderSmartContract,
// metaTxbuilderStaking,
];

export const metaTxbuilder = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,7 @@ export default function SendPayment() {
);

const signedTx = await wallet.signTx(unsignedTx, true);
const txHash = await wallet.submitTx(signedTx);
console.log({ txHash });
await wallet.submitTx(signedTx);

setLoading(false);
setDone(true);
Expand Down
Loading

0 comments on commit 8d89257

Please sign in to comment.