From 9768dc608173fbd6d183550ab43c4ad0650902f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20P=C4=99dziwiatr?= <ppe@MBP-Piotr.ht.home>
Date: Fri, 8 Mar 2024 16:08:07 +0100
Subject: [PATCH 1/2] fix: prevent IW if no 'interact-write' tag is present

---
 src/core/modules/impl/TagsParser.ts           |  6 +++
 .../impl/handler/AbstractContractHandler.ts   | 50 ++++++++++++++-----
 2 files changed, 43 insertions(+), 13 deletions(-)

diff --git a/src/core/modules/impl/TagsParser.ts b/src/core/modules/impl/TagsParser.ts
index 753acb14..a9a53f8a 100644
--- a/src/core/modules/impl/TagsParser.ts
+++ b/src/core/modules/impl/TagsParser.ts
@@ -118,4 +118,10 @@ export class TagsParser {
       return t.name == WARP_TAGS.REQUEST_VRF && t.value === 'true';
     });
   }
+
+  hasInteractWriteTag(interaction: GQLNodeInterface, contractTxId: string): boolean {
+    return interaction.tags.some((t) => {
+      return t.name == WARP_TAGS.INTERACT_WRITE && t.value === contractTxId;
+    });
+  }
 }
diff --git a/src/core/modules/impl/handler/AbstractContractHandler.ts b/src/core/modules/impl/handler/AbstractContractHandler.ts
index b3ad6e40..3aa5ca07 100644
--- a/src/core/modules/impl/handler/AbstractContractHandler.ts
+++ b/src/core/modules/impl/handler/AbstractContractHandler.ts
@@ -6,9 +6,12 @@ import { SmartWeaveGlobal } from '../../../../legacy/smartweave-global';
 import { LoggerFactory } from '../../../../logging/LoggerFactory';
 import { deepCopy } from '../../../../utils/utils';
 import { ContractError, HandlerApi, InteractionData, InteractionResult } from '../HandlerExecutorFactory';
+import { TagsParser } from '../TagsParser';
+import { Contract } from '../../../../contract/Contract';
 
 export abstract class AbstractContractHandler<State> implements HandlerApi<State> {
   protected logger = LoggerFactory.INST.create('ContractHandler');
+  private readonly tagsParser = new TagsParser();
 
   protected constructor(
     protected readonly swGlobal: SmartWeaveGlobal,
@@ -46,30 +49,39 @@ export abstract class AbstractContractHandler<State> implements HandlerApi<State
       if (!executionContext.evaluationOptions.internalWrites) {
         throw new Error("Internal writes feature switched off. Change EvaluationOptions.internalWrites flag to 'true'");
       }
-
-      const effectiveThrowOnError =
-        throwOnError == undefined ? executionContext.evaluationOptions.throwOnInternalWriteError : throwOnError;
-
       const debugData = {
         from: this.contractDefinition.txId,
         to: contractTxId,
         input
       };
 
+      const activeTx = this.swGlobal._activeTx;
+      if (
+        !activeTx.dry &&
+        !this.tagsParser.hasInteractWriteTag(activeTx, contractTxId) &&
+        !this.isWriteBack(executionContext.contract, contractTxId)
+      ) {
+        throw new Error(
+          `No interact write tag for interaction ${activeTx.id}: ${JSON.stringify(debugData)} \n ${JSON.stringify(
+            activeTx
+          )}`
+        );
+      }
+
+      const effectiveThrowOnError =
+        throwOnError == undefined ? executionContext.evaluationOptions.throwOnInternalWriteError : throwOnError;
       this.logger.debug('swGlobal.write call:', debugData);
 
       // The contract that we want to call and modify its state
       const calleeContract = executionContext.warp.contract(contractTxId, executionContext.contract, {
-        callingInteraction: this.swGlobal._activeTx,
+        callingInteraction: activeTx,
         callType: 'write'
       });
-      const result = await calleeContract.applyInput<Input>(input, this.swGlobal._activeTx, executionContext.signal);
+      const result = await calleeContract.applyInput<Input>(input, activeTx, executionContext.signal);
 
-      this.logger.debug('Cache result?:', !this.swGlobal._activeTx.dry);
+      this.logger.debug('Cache result?:', !activeTx.dry);
       const shouldAutoThrow =
-        result.type !== 'ok' &&
-        effectiveThrowOnError &&
-        (!this.swGlobal._activeTx.dry || (this.swGlobal._activeTx.dry && this.swGlobal._activeTx.strict));
+        result.type !== 'ok' && effectiveThrowOnError && (!activeTx.dry || (activeTx.dry && activeTx.strict));
 
       const effectiveErrorMessage = shouldAutoThrow
         ? `Internal write auto error for call [${JSON.stringify(debugData)}]: ${result.errorMessage}`
@@ -78,7 +90,7 @@ export abstract class AbstractContractHandler<State> implements HandlerApi<State
       const resultErrorMessages = effectiveErrorMessage
         ? {
             ...result.originalErrorMessages,
-            [this.swGlobal._activeTx.id]: effectiveErrorMessage
+            [activeTx.id]: effectiveErrorMessage
           }
         : result.originalErrorMessages;
       calleeContract.interactionState().update(
@@ -87,11 +99,11 @@ export abstract class AbstractContractHandler<State> implements HandlerApi<State
           state: result.state as State,
           validity: {
             ...result.originalValidity,
-            [this.swGlobal._activeTx.id]: result.type == 'ok'
+            [activeTx.id]: result.type == 'ok'
           },
           errorMessages: resultErrorMessages
         },
-        this.swGlobal._activeTx.sortKey
+        activeTx.sortKey
       );
 
       if (shouldAutoThrow) {
@@ -180,4 +192,16 @@ export abstract class AbstractContractHandler<State> implements HandlerApi<State
         .get(this.swGlobal.contract.id, this.swGlobal._activeTx.sortKey)?.state;
     };
   }
+
+  private isWriteBack(contract: Contract<State>, target: string): boolean {
+    let current = contract as Contract;
+    while (current.parent()) {
+      current = current.parent();
+      if (current.txId() === target) {
+        return true;
+      }
+    }
+
+    return false;
+  }
 }

From b7d7d4ab6b61338d437bda2f939aa5a050233ae8 Mon Sep 17 00:00:00 2001
From: ppedziwiatr <ppedziwiatr@gmail.com>
Date: Mon, 11 Mar 2024 15:35:17 +0100
Subject: [PATCH 2/2] chore: temp switch of regression tests due to issues with
 arweave.net gw

---
 .github/workflows/tests.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 1d7e0fe4..f679a817 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -27,8 +27,6 @@ jobs:
         run: yarn test:integration:wasm
       - name: Test example rust contracts
         run: yarn build:test:wasm
-      - name: Run regression tests
-        run: yarn test:regression
       - name: Trigger integration tests
         if: github.ref_name == 'main'
         run: >