Skip to content

Commit

Permalink
chore: revert "remove NFT burning, only mint more"
Browse files Browse the repository at this point in the history 
This reverts commit 6d7af06.
  • Loading branch information
@Polybius93
Polybius93 committed Oct 15, 2024
1 parent a7ff441 commit cfbd637
Showing 1 changed file with 83 additions and 14 deletions.
97 changes: 83 additions & 14 deletions src/network-handlers/ripple-handler.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,9 +127,7 @@ export class RippleHandler {
if (matchingNFT.length === 0) {
throw new RippleError(`Vault with UUID: ${nftUUID} not found`);
} else if (matchingNFT.length > 1) {
// we have multiple NFTs with the same UUID, this is not a problem
// let's just return the one with the highest nft_serial
matchingNFT.sort((a, b) => a.nft_serial - b.nft_serial);
throw new RippleError(`Multiple Vaults with UUID: ${nftUUID} found`);
}
const matchingVault: RawVault = decodeURI(matchingNFT[0].URI!);
return lowercaseHexFields(matchingVault);
Expand All @@ -152,7 +150,7 @@ export class RippleHandler {
}
}

async withdraw(uuid: string, withdrawAmount: bigint): Promise<string> {
async withdraw(uuid: string, withdrawAmount: bigint): Promise<string[]> {
// Things like withdraw and deposit should get the existing NFT vault
// then burn the NFT, and mint a new one with the updated value
// putting the UUID into the URI
Expand All @@ -164,23 +162,36 @@ export class RippleHandler {
let nftUUID = uuid.substring(0, 2) === '0x' ? uuid.slice(2) : uuid;
nftUUID = nftUUID.toUpperCase();
const thisVault = await this.getRawVault(nftUUID);
const burnSig = await this.burnNFT(nftUUID, 1);

thisVault.valueMinted = thisVault.valueMinted.sub(BigNumber.from(withdrawAmount));
const mintSig = await this.mintNFT(thisVault);
return mintSig;
const mintSig = await this.mintNFT(thisVault, 2);
return [burnSig, mintSig];
} catch (error) {
throw new RippleError(`Unable to perform Withdraw for User: ${error}`);
}
}

async setVaultStatusFunded(
burnNFTSignedTxBlobs: string[],
mintTokensSignedTxBlobs: string[], // this can be a set of empty string is no tokens are being minted
mintNFTSignedTxBlobs: string[]
): Promise<void> {
if (!this.client.isConnected()) {
await this.client.connect();
}
try {
console.log('Doing the burn for SSF');
const burn_multisig_tx = xrpl.multisign(burnNFTSignedTxBlobs);
const burnTx: xrpl.TxResponse<xrpl.SubmittableTransaction> =
await this.client.submitAndWait(burn_multisig_tx);
const burnMeta: NFTokenMintMetadata = burnTx.result.meta! as NFTokenMintMetadata;
if (burnMeta!.TransactionResult !== 'tesSUCCESS') {
throw new RippleError(
`Could not burn temporary Ripple Vault: ${burnMeta!.TransactionResult}`
);
}

// multisig mint
if (mintTokensSignedTxBlobs.every(sig => sig !== '')) {
console.log('Success! Now minting the actual tokens!! How fun $$');
Expand Down Expand Up @@ -216,14 +227,15 @@ export class RippleHandler {

async performCheckCashAndNftUpdate(
cashCheckSignedTxBlobs: string[],
burnNFTSignedTxBlobs: string[],
mintNFTSignedTxBlobs: string[]
): Promise<void> {
if (!this.client.isConnected()) {
await this.client.connect();
}
try {
console.log('Doing the check cashing');
// multisig cash check
// multisig burn
const cash_check_tx = xrpl.multisign(cashCheckSignedTxBlobs);
const cashCheckTx: xrpl.TxResponse<xrpl.SubmittableTransaction> =
await this.client.submitAndWait(cash_check_tx); // add timeouts
Expand All @@ -232,6 +244,18 @@ export class RippleHandler {
throw new RippleError(`Could not cash check: ${cashCheckMeta!.TransactionResult}`);
}

console.log('Doing the burn for SSP');
// multisig burn
const burn_multisig_tx = xrpl.multisign(burnNFTSignedTxBlobs);
const burnTx: xrpl.TxResponse<xrpl.SubmittableTransaction> =
await this.client.submitAndWait(burn_multisig_tx); // add timeouts
const burnMeta: NFTokenMintMetadata = burnTx.result.meta! as NFTokenMintMetadata;
if (burnMeta!.TransactionResult !== 'tesSUCCESS') {
throw new RippleError(
`Could not burn temporary Ripple Vault: ${burnMeta!.TransactionResult}`
);
}

console.log('Success! Now Doing the mint for SSP');

// multisig mint
Expand All @@ -251,11 +275,26 @@ export class RippleHandler {
}
}

async setVaultStatusPending(mintNFTSignedTxBlobs: string[]): Promise<void> {
async setVaultStatusPending(
burnNFTSignedTxBlobs: string[],
mintNFTSignedTxBlobs: string[]
): Promise<void> {
if (!this.client.isConnected()) {
await this.client.connect();
}
try {
console.log('Doing the burn for SSP');
// multisig burn
const burn_multisig_tx = xrpl.multisign(burnNFTSignedTxBlobs);
const burnTx: xrpl.TxResponse<xrpl.SubmittableTransaction> =
await this.client.submitAndWait(burn_multisig_tx);
const burnMeta: NFTokenMintMetadata = burnTx.result.meta! as NFTokenMintMetadata;
if (burnMeta!.TransactionResult !== 'tesSUCCESS') {
throw new RippleError(
`Could not burn temporary Ripple Vault: ${burnMeta!.TransactionResult}`
);
}

console.log('Success! Now Doing the mint for SSP');

// multisig mint
Expand Down Expand Up @@ -320,7 +359,36 @@ export class RippleHandler {
}
}

async mintNFT(vault: RawVault, incrementBy: number = 1): Promise<string> {
async burnNFT(nftUUID: string, incrementBy: number = 0): Promise<string> {
if (!this.client.isConnected()) {
await this.client.connect();
}
console.log(`Getting sig for Burning Ripple Vault, vault: ${nftUUID}`);
const nftTokenId = await this.getNFTokenIdForVault(nftUUID);
const burnTransactionJson: SubmittableTransaction = {
TransactionType: 'NFTokenBurn',
Account: this.issuerAddress,
NFTokenID: nftTokenId,
};
const preparedBurnTx = await this.client.autofill(burnTransactionJson, 3); // this hardcoded number should match the number of active signers

// set the LastLedgerSequence to equal LastLedgerSequence plus 5 and then rounded up to the nearest 10
// this is to ensure that the transaction is valid for a while, and that the different attestors all use a matching LLS value to have matching sigs
preparedBurnTx.LastLedgerSequence =
Math.ceil(preparedBurnTx.LastLedgerSequence! / 10000 + 1) * 10000; // Better way?!?

if (incrementBy > 0) {
preparedBurnTx.Sequence = preparedBurnTx.Sequence! + incrementBy;
}

console.log('preparedBurnTx ', preparedBurnTx);

const sig = this.wallet.sign(preparedBurnTx, true);
// console.log('tx_one_sig: ', sig);
return sig.tx_blob;
}

async mintNFT(vault: RawVault, incrementBy: number = 0): Promise<string> {
if (!this.client.isConnected()) {
await this.client.connect();
}
Expand All @@ -339,8 +407,9 @@ export class RippleHandler {
// this is to ensure that the transaction is valid for a while, and that the different attestors all use a matching LLS value to have matching sigs
preparedMintTx.LastLedgerSequence =
Math.ceil(preparedMintTx.LastLedgerSequence! / 10000 + 1) * 10000;

preparedMintTx.Sequence = preparedMintTx.Sequence! + incrementBy;
if (incrementBy > 0) {
preparedMintTx.Sequence = preparedMintTx.Sequence! + incrementBy;
}

console.log('preparedMintTx ', preparedMintTx);

Expand Down Expand Up @@ -434,11 +503,11 @@ export class RippleHandler {
`Could not find Vault for Check with Invoice ID: ${check.InvoiceID}`
);
}
const mint_sig = await this.withdraw(
const two_more_sigs = await this.withdraw(
vault.uuid,
BigInt(shiftValue(Number(checkSendMax.value)))
);
return [my_check_cash_sig, mint_sig];
return [my_check_cash_sig, ...two_more_sigs];
} catch (error) {
console.error(`Error cashing Check: ${error} \n continuing`);
}
Expand All @@ -451,7 +520,7 @@ export class RippleHandler {
await this.client.connect();
}

// remove this??
//what's
if (
[
'8FC923A16C90FB7316673D35CA228C82916B8E9F63EADC57BAA7C51C2E7716AA',
Expand Down

0 comments on commit cfbd637

Please sign in to comment.