done

Backend/Workspace/Routes/CreateRoom.js

@@ -89,7 +89,18 @@ router.post("/", VCM('LOGIN_TOKEN', process.env.LOGIN_SECRET), upload.fields([{
       // ===== DBに保存する前に、モザイクをブロックチェーンに登録 =====
       try {
         console.log("[CreateRoom] Announcing Mosaic Definition Transaction...");
-        await SignAndAnnounce(mosaicDefinitionTx, privateKey, facade, 'https://sym-test-01.opening-line.jp:3001');
+        const definitionResult = await SignAndAnnounce(
+          mosaicDefinitionTx,
+          privateKey,
+          facade,
+          'https://sym-test-01.opening-line.jp:3001',
+          {
+            waitForConfirmation: true,
+            confirmationTimeoutMs: 180000,
+            pollIntervalMs: 2000
+          }
+        );
+        console.log("[CreateRoom] Mosaic Definition TX Hash:", definitionResult.hash);
         console.log("[CreateRoom] Mosaic Definition TX Announced Successfully!");
 
         // ===== 供給量設定トランザクション作成・送信 =====
@@ -103,7 +114,18 @@ router.post("/", VCM('LOGIN_TOKEN', process.env.LOGIN_SECRET), upload.fields([{
         });
 
         console.log("[CreateRoom] Announcing Supply Change Transaction...");
-        await SignAndAnnounce(supplyTx, privateKey, supplyFacade, 'https://sym-test-01.opening-line.jp:3001');
+        const supplyResult = await SignAndAnnounce(
+          supplyTx,
+          privateKey,
+          supplyFacade,
+          'https://sym-test-01.opening-line.jp:3001',
+          {
+            waitForConfirmation: true,
+            confirmationTimeoutMs: 180000,
+            pollIntervalMs: 2000
+          }
+        );
+        console.log("[CreateRoom] Supply Change TX Hash:", supplyResult.hash);
         console.log("[CreateRoom] Supply Change TX Announced Successfully!");
 
       } catch (txErr) {

Backend/Workspace/Routes/SendTokenByNFC.js

@@ -75,8 +75,9 @@ router.post('/NFC/Submit', VCM('LOGIN_TOKEN', process.env.LOGIN_SECRET), async (
     try {
         const { sendtoUserID, Amount } = req.body;
         const fromUserID = req.auth.userId;
+        const parsedAmount = Number(Amount);
 
-        if (!sendtoUserID || !Amount || isNaN(Amount)) {
+        if (!sendtoUserID || Number.isNaN(parsedAmount) || parsedAmount <= 0 || !Number.isInteger(parsedAmount)) {
             return res.status(400).json({ message: '不正なパラメータです' });
         }
 
@@ -85,7 +86,7 @@ router.post('/NFC/Submit', VCM('LOGIN_TOKEN', process.env.LOGIN_SECRET), async (
         pendingTransfers.set(reservationID, {
             fromUserID,
             sendtoUserID,
-            Amount,
+            Amount: parsedAmount,
             updatedAt: Date.now(),
             processedUids: {} // 【追加】二重引き落とし防止のための履歴
         });
@@ -167,7 +168,7 @@ router.post('/NFC', async (req, res) => {
         if (!fromAddressInfo.length) throw new Error("送金元アドレスが見つかりません");
 
         const currentAmount = await LeftTokenAmount(fromAddressInfo[0].Address, MosaicIDHex, nodeUrl);
-        const transferAmount = BigInt(Amount) * 1_000_000n;
+        const transferAmount = BigInt(Amount);
         if (currentAmount < transferAmount) {
             throw new Error("残高不足です");
         }
@@ -205,11 +206,11 @@ router.post('/NFC', async (req, res) => {
             networkType: 'testnet',
             senderPrivateKey: decryptedPrivateKey,
             recipientRawAddress: SendToAddress,
-            message: `Payment via NFC Gate`,
+            messageText: `Payment via NFC Gate`,
             mosaics: [
                 { 
                     mosaicId: BigInt(`0x${MosaicIDHex}`), 
-                    amount: BigInt(Amount) * 1_000_000n 
+                    amount: BigInt(Amount)
                 }
             ],
             deadlineHours: 2,

Backend/Workspace/Tools/CreateMosaicTx.js

@@ -8,6 +8,8 @@ export function CreateMosaicTx({
     networkType = 'testnet',
     senderPrivateKey,
     transferable = true,
+    duration = 86400n,
+    fee = 1_000_000n,
     deadlineHours = 2
 }) {
 
@@ -16,9 +18,10 @@ export function CreateMosaicTx({
     const privateKey = new PrivateKey(senderPrivateKey.trim());
     const keyPair = facade.createAccount(privateKey);
 
+    const safeDeadlineHours = Math.min(Math.max(Number(deadlineHours) || 2, 1), 2);
     const deadline = facade.network
         .fromDatetime(new Date())
-        .addHours(Number(deadlineHours))
+        .addHours(safeDeadlineHours)
         .timestamp;
 
     // uint32 nonce
@@ -40,7 +43,8 @@ export function CreateMosaicTx({
     const mosaicDefinitionTx = facade.transactionFactory.create({
         type: 'mosaic_definition_transaction_v1',
         signerPublicKey: keyPair.publicKey,
-        duration: 0n,
+        fee: BigInt(fee),
+        duration: BigInt(duration),
         nonce: nonce,
         flags: flags,
         divisibility: 0,

Backend/Workspace/Tools/CreateTransferTx.js

@@ -24,7 +24,8 @@ export default function CreateTransferTx({
     const keyPair = facade.createAccount(privateKeyObject);
 
     // Deadline 作成 (v3のfromDatetimeはDateオブジェクトを受け取ります)
-    const deadline = facade.network.fromDatetime(new Date()).addHours(Number(deadlineHours)).timestamp;
+    const safeDeadlineHours = Math.min(Math.max(Number(deadlineHours) || 2, 1), 2);
+    const deadline = facade.network.fromDatetime(new Date()).addHours(safeDeadlineHours).timestamp;
     console.log(`[${logOwner}] Intermediate => KeyPair created, Deadline calculated`);
 
     // メッセージの作成

Backend/Workspace/Tools/SignAndAnnounce.js

@@ -1,10 +1,44 @@
 import { PrivateKey } from 'symbol-sdk';
 import { SymbolFacade } from 'symbol-sdk/symbol';
 
-export default async function SignAndAnnounce(tx, privateKey, facade, nodeUrl) {
+const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+
+async function waitForConfirmation(nodeUrl, hash, {
+    timeoutMs = 120000,
+    intervalMs = 2000
+} = {}) {
+    const startedAt = Date.now();
+
+    while (Date.now() - startedAt < timeoutMs) {
+        const confirmedRes = await fetch(`${nodeUrl}/transactions/confirmed/${hash}`);
+        if (confirmedRes.ok) {
+            return { confirmed: true };
+        }
+
+        const statusRes = await fetch(`${nodeUrl}/transactionStatus/${hash}`);
+        if (statusRes.ok) {
+            const statusJson = await statusRes.json();
+            const code = statusJson?.code;
+            if (code && code !== 'Success') {
+                throw new Error(`Transaction rejected: ${code}`);
+            }
+        }
+
+        await sleep(intervalMs);
+    }
+
+    throw new Error(`Transaction confirmation timeout: ${hash}`);
+}
+
+export default async function SignAndAnnounce(tx, privateKey, facade, nodeUrl, options = {}) {
     // Startup Log
     const logOwner = "SignAndAnnounce";
     console.log(`\n${logOwner}-Function is running!\n`);
+    const {
+        waitForConfirmation: shouldWaitForConfirmation = false,
+        confirmationTimeoutMs = 120000,
+        pollIntervalMs = 2000
+    } = options;
 
     // I/O Log 
     // ※ テンプレートリテラル( `${}` )内でオブジェクトを呼ぶと [object Object] になってしまうため、
@@ -24,9 +58,13 @@ export default async function SignAndAnnounce(tx, privateKey, facade, nodeUrl) {
     try {
         // 署名 (v3 SDK)
         const signature = facade.signTransaction(account.keyPair, tx);
-        // ！！！ここを追加！！！
+        if (!tx.signature?.bytes || !signature?.bytes) {
+            throw new Error('Transaction signature buffer is invalid');
+        }
+        tx.signature.bytes.set(signature.bytes);
+
         const hash = facade.hashTransaction(tx).toString();
-        console.log(`[Debug] Transaction Hash: ${hash}`);
+        console.log(`[${logOwner}] Transaction Hash: ${hash}`);
 
         // 署名付きトランザクションペイロード作成 (v3 SDK)
         // ※ v3では attachSignature が JSON形式の文字列（'{"payload": "..."}'）を返すのが標準的です。
@@ -55,6 +93,21 @@ export default async function SignAndAnnounce(tx, privateKey, facade, nodeUrl) {
 
         console.log(`[${logOwner}] Successfully announced transaction!`);
 
+        if (shouldWaitForConfirmation) {
+            console.log(`[${logOwner}] Waiting for confirmation...`);
+            await waitForConfirmation(nodeUrl, hash, {
+                timeoutMs: confirmationTimeoutMs,
+                intervalMs: pollIntervalMs
+            });
+            console.log(`[${logOwner}] Transaction confirmed!`);
+        }
+
+        return {
+            hash,
+            announced: true,
+            confirmed: shouldWaitForConfirmation
+        };
+
     } catch (error) {
         console.error(`[${logOwner}] Error:`, error);
         throw error; // ルーター側のcatchで捕まえられるようにエラーを再スローします

Backend/Workspace/Tools/SupplyMosaic.js

@@ -7,6 +7,7 @@ export const CreateSupplyTx = ({
     senderPrivateKey,
     supply = 1_000_000n,
     mosaicId,
+    fee = 1_000_000n,
     deadlineHours = 2
 }) => {
 
@@ -19,6 +20,10 @@ export const CreateSupplyTx = ({
     if (!mosaicId)
         throw new Error("mosaicId is undefined");
 
+    const supplyDelta = BigInt(supply);
+    if (supplyDelta <= 0n)
+        throw new Error("supply must be greater than 0");
+
     // Facade
     const facade = new SymbolFacade(networkType);
 
@@ -27,19 +32,21 @@ export const CreateSupplyTx = ({
     const keyPair = facade.createAccount(privateKey);
 
     // Deadline
+    const safeDeadlineHours = Math.min(Math.max(Number(deadlineHours) || 2, 1), 2);
     const deadline = facade.network
         .fromDatetime(new Date())
-        .addHours(Number(deadlineHours))
+        .addHours(safeDeadlineHours)
         .timestamp;
 
     // ★ ここ重要
     const supplyTx = facade.transactionFactory.create({
         type: 'mosaic_supply_change_transaction_v1',
         signerPublicKey: keyPair.publicKey,
+        fee: BigInt(fee),
 
         mosaicId: BigInt('0x' + mosaicId), // 必ずBigInt
-        delta: BigInt(supply),             // 必ずBigInt
-        action: 0,                         // ★ increaseは0
+        delta: supplyDelta,                // 必ずBigInt
+        action: 1,                         // increase は 1
 
         deadline
     });