Merge pull request #1126 from Chia-Network/fix/transfer-staging-lockout

fix: bug in which active transfers prevent transfer related actions
Chia-Network · Jul 17, 2024 · 8b8da07 · 8b8da07
2 parents 2f99321 + 02024f2
commit 8b8da07
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 10 deletions.
diff --git a/src/controllers/offer.controller.js b/src/controllers/offer.controller.js
@@ -4,13 +4,14 @@ import { Meta, Staging } from '../models';
 
 import {
   assertHomeOrgExists,
-  assertNoPendingCommits,
   assertWalletIsSynced,
   assertIfReadOnlyMode,
   assertStagingTableNotEmpty,
   assertStagingTableIsEmpty,
   assertNoActiveOfferFile,
   assertActiveOfferFile,
+  assertNoPendingCommitsExcludingTransfers,
+  assertNoPendingCommits,
 } from '../utils/data-assertions';
 
 import { deserializeMaker, deserializeTaker } from '../utils/datalayer-utils';
@@ -26,7 +27,7 @@ export const generateOfferFile = async (req, res) => {
     await assertStagingTableNotEmpty();
     await assertHomeOrgExists();
     await assertWalletIsSynced();
-    await assertNoPendingCommits();
+    await assertNoPendingCommitsExcludingTransfers();
 
     const offerFile = await Staging.generateOfferFile();
     res.json(offerFile);
@@ -46,7 +47,7 @@ export const cancelActiveOffer = async (req, res) => {
     await assertStagingTableNotEmpty();
     await assertHomeOrgExists();
     await assertWalletIsSynced();
-    await assertNoPendingCommits();
+    await assertNoPendingCommitsExcludingTransfers();
 
     const activeOffer = await Meta.findOne({
       where: { metaKey: 'activeOfferTradeId' },
@@ -121,7 +122,7 @@ export const commitImportedOfferFile = async (req, res) => {
     await assertStagingTableIsEmpty();
     await assertHomeOrgExists();
     await assertWalletIsSynced();
-    await assertNoPendingCommits();
+    await assertNoPendingCommitsExcludingTransfers();
 
     const offerFile = await Meta.findOne({
       where: { metaKey: 'activeOffer' },
@@ -193,8 +194,6 @@ export const getCurrentOfferInfo = async (req, res) => {
     const makerChanges = deserializeMaker(offerFile.offer.maker);
     const takerChanges = deserializeTaker(offerFile.offer.taker);
 
-    console.log(makerChanges);
-
     let maker = makerChanges.filter((record) => record.table === 'project');
 
     makerChanges.forEach((record) => {

diff --git a/src/datalayer/persistance.js b/src/datalayer/persistance.js
@@ -611,17 +611,15 @@ const getSubscriptions = async () => {
 const makeOffer = async (offer) => {
   const url = `${CONFIG.DATALAYER_URL}/make_offer`;
   const { cert, key, timeout } = getBaseOptions();
+  offer.fee = CONFIG.DEFAULT_FEE;
 
   try {
     const response = await superagent
       .post(url)
       .key(key)
       .cert(cert)
       .timeout(timeout)
-      .send({
-        ...offer,
-        fee: _.get(CONFIG, 'DEFAULT_FEE', 300000000),
-      });
+      .send(offer);
 
     const data = response.body;
 

diff --git a/src/utils/data-assertions.js b/src/utils/data-assertions.js
@@ -70,6 +70,19 @@ export const assertNoPendingCommits = async () => {
   }
 };
 
+export const assertNoPendingCommitsExcludingTransfers = async () => {
+  const pendingCommits = await Staging.findAll({
+    where: { commited: true, failedCommit: false, isTransfer: false },
+    raw: true,
+  });
+
+  if (pendingCommits.length > 0) {
+    throw new Error(
+      'You currently have changes pending on the blockchain. Please wait for them to propagate before making more changes',
+    );
+  }
+};
+
 export const assertWalletIsSynced = async () => {
   if (!USE_SIMULATOR) {
     if (!(await datalayer.walletIsSynced())) {