Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: build errors #219

Merged
merged 1 commit into from
May 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions packages/contracts/src/common.ts
Original file line number Diff line number Diff line change
@@ -1,17 +1,23 @@
import { MeshTxBuilder, IFetcher, UTxO, BrowserWallet } from '@meshsdk/core';
import {
MeshTxBuilder,
IFetcher,
UTxO,
BrowserWallet,
MeshWallet,
} from '@meshsdk/core';
import { v2ScriptToBech32 } from '@meshsdk/mesh-csl';

export type MeshTxInitiatorInput = {
mesh: MeshTxBuilder;
fetcher?: IFetcher;
wallet?: BrowserWallet;
wallet?: BrowserWallet | MeshWallet;
networkId?: number;
};

export class MeshTxInitiator {
mesh: MeshTxBuilder;
fetcher?: IFetcher;
wallet?: BrowserWallet;
wallet?: BrowserWallet | MeshWallet;
networkId = 0;

constructor({ mesh, fetcher, wallet, networkId }: MeshTxInitiatorInput) {
Expand Down
2 changes: 1 addition & 1 deletion packages/demo/components/pages/about/catalyst.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export default function Catalyst() {
Here are proposals that we have submitted to Project Catalyst and
its progress.
</p>
<div className="grid grid-cols-3 gap-2 w-full">
<div className="grid grid-cols-1 lg:grid-cols-3 gap-2 w-full">
<ListOfProposals />
</div>
</div>
Expand Down
6 changes: 4 additions & 2 deletions packages/demo/components/site/navbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ import {
ArrowsRightLeftIcon,
GiftIcon,
CodeBracketSquareIcon,
AcademicCapIcon,
PlayCircleIcon,
} from '@heroicons/react/24/solid';
import SvgGithub from '../svgs/github';
import SvgMesh from '../svgs/mesh';
Expand Down Expand Up @@ -204,7 +206,7 @@ function SubMenuGetStarted() {
desc="Start your building journey"
icon={<AcademicCapIcon className="w-5 h-5" />}
/>
<SubMenuLinks
{/* <SubMenuLinks
href={`https://www.youtube.com/playlist?list=PLCCIAmutGEbdez44WwToVG9HMenViQszp`}
title="Mesh PBL Videos"
desc="Watch and Learn"
Expand All @@ -215,7 +217,7 @@ function SubMenuGetStarted() {
title="Mesh Livecoding Videos"
desc="Livecoding on Gimbalabs"
icon={<PlayCircleIcon className="w-5 h-5" />}
/>
/> */}
</ul>
</div>
</div>
Expand Down
11 changes: 7 additions & 4 deletions packages/demo/pages/debug/mesh/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -219,10 +219,13 @@ export default function Mesh() {
// note, must change this to the txhash of the previous tx
'f40f880e1571b332c426ba2769e98a62aa13446e66fe876eaf94724a0b53643a'
);
const tx = await contract.cancelEscrow(utxo);
const signedTx = await wallet.signTx(tx, true);
const txHash = await wallet.submitTx(signedTx);
console.log(1, txHash);

if (utxo) {
const tx = await contract.cancelEscrow(utxo);
const signedTx = await wallet.signTx(tx, true);
const txHash = await wallet.submitTx(signedTx);
console.log(1, txHash);
}
}

return (
Expand Down
Loading
Loading