Skip to content

Commit

Permalink
Merge pull request #528 from BibliothecaDAO/fix/dynamic-approval
Browse files Browse the repository at this point in the history
Fix approval contract error from dynamic price
  • Loading branch information
starknetdev authored Jan 9, 2024
2 parents 6297f99 + 88408d2 commit ebf7455
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 5 deletions.
15 changes: 13 additions & 2 deletions ui/src/app/components/start/Spawn.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,11 @@ import {

export interface SpawnProps {
formData: FormData;
spawn: (formData: FormData, goldenTokenId: string) => Promise<void>;
spawn: (
formData: FormData,
goldenTokenId: string,
costToPlay?: number
) => Promise<void>;
handleBack: () => void;
lordsBalance?: bigint;
goldenTokenData: any;
Expand All @@ -43,6 +47,7 @@ export const Spawn = ({
const [showWalletTutorial, setShowWalletTutorial] = useState(false);
const [formFilled, setFormFilled] = useState(false);
const [usableToken, setUsableToken] = useState<string>("0");
const [costToPlay, setCostToPlay] = useState<number | undefined>();
const isWrongNetwork = useUIStore((state) => state.isWrongNetwork);
const loading = useLoadingStore((state) => state.loading);
const estimatingFee = useUIStore((state) => state.estimatingFee);
Expand Down Expand Up @@ -70,7 +75,7 @@ export const Spawn = ({

const handleSubmitLords = async () => {
resetNotification();
await spawn(formData, "0");
await spawn(formData, "0", costToPlay!);
await getBalances();
};

Expand Down Expand Up @@ -121,6 +126,11 @@ export const Spawn = ({
setFetchedAverageBlockTime(true);
};

const getCostToPlay = async () => {
const cost = await gameContract.call("get_cost_to_play", []);
setCostToPlay(parseInt(cost.toString()));
};

useEffect(() => {
if (onMainnet && !fetchedAverageBlockTime && currentBlockNumber > 0) {
fetchData();
Expand All @@ -129,6 +139,7 @@ export const Spawn = ({

useEffect(() => {
getUsableGoldenToken(goldenTokens);
getCostToPlay();
}, []);

return (
Expand Down
10 changes: 7 additions & 3 deletions ui/src/app/lib/utils/syscalls.ts
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,11 @@ export function syscalls({
showDeathDialog(true);
};

const spawn = async (formData: FormData, goldenTokenId: string) => {
const spawn = async (
formData: FormData,
goldenTokenId: string,
costToPlay?: number
) => {
const storage: BurnerStorage = Storage.get("burners");
let interfaceCamel = "";
const isArcade = checkArcadeConnector(connector!);
Expand All @@ -286,8 +290,8 @@ export function syscalls({
const approveLordsSpendingTx = {
contractAddress: lordsContract?.address ?? "",
entrypoint: "approve",
calldata: [gameContract?.address ?? "", (25 * 10 ** 18).toString(), "0"],
}; // Approve 25 LORDS to be spent each time spawn is called
calldata: [gameContract?.address ?? "", costToPlay!.toString(), "0"],
}; // Approve dynamic LORDS to be spent each time spawn is called based on the get_cost_to_play

const mintAdventurerTx = {
contractAddress: gameContract?.address ?? "",
Expand Down

1 comment on commit ebf7455

@vercel
Copy link

@vercel vercel bot commented on ebf7455 Jan 9, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.