From 3ec30e911d8d8001fd9265a3f4fcce62607f9e5a Mon Sep 17 00:00:00 2001
From: Alex <alexanderoleshkevich@coinweb.io>
Date: Tue, 8 Apr 2025 13:43:29 +0300
Subject: [PATCH] refactor: change structure of code

---
 packages/contract.cm/src/onchain/addWord.ts              | 2 +-
 packages/cwait/src/onchain/executor.ts                   | 4 ++--
 packages/cwait/src/onchain/index.ts                      | 2 +-
 .../cwait/src/onchain/{ops => promisifedOps}/awaited.ts  | 0
 packages/cwait/src/onchain/promisifedOps/index.ts        | 3 +++
 .../cwait/src/onchain/{ => promisifedOps}/ops/block.ts   | 4 ++--
 .../cwait/src/onchain/{ => promisifedOps}/ops/index.ts   | 3 +--
 .../src/onchain/{ => promisifedOps}/ops/rangeRead.ts     | 9 ++++-----
 .../cwait/src/onchain/{ => promisifedOps}/ops/read.ts    | 9 ++++-----
 .../cwait/src/onchain/{ => promisifedOps}/ops/store.ts   | 4 ++--
 .../cwait/src/onchain/{ => promisifedOps}/ops/take.ts    | 7 +++----
 .../cwait/src/onchain/{ops => promisifedOps}/resolved.ts | 0
 12 files changed, 23 insertions(+), 24 deletions(-)
 rename packages/cwait/src/onchain/{ops => promisifedOps}/awaited.ts (100%)
 create mode 100644 packages/cwait/src/onchain/promisifedOps/index.ts
 rename packages/cwait/src/onchain/{ => promisifedOps}/ops/block.ts (86%)
 rename packages/cwait/src/onchain/{ => promisifedOps}/ops/index.ts (64%)
 rename packages/cwait/src/onchain/{ => promisifedOps}/ops/rangeRead.ts (83%)
 rename packages/cwait/src/onchain/{ => promisifedOps}/ops/read.ts (79%)
 rename packages/cwait/src/onchain/{ => promisifedOps}/ops/store.ts (87%)
 rename packages/cwait/src/onchain/{ => promisifedOps}/ops/take.ts (82%)
 rename packages/cwait/src/onchain/{ops => promisifedOps}/resolved.ts (100%)

diff --git a/packages/contract.cm/src/onchain/addWord.ts b/packages/contract.cm/src/onchain/addWord.ts
index 9537edb..d88c2f9 100644
--- a/packages/contract.cm/src/onchain/addWord.ts
+++ b/packages/contract.cm/src/onchain/addWord.ts
@@ -13,7 +13,7 @@ function hashCode(str: string): string {
     // eslint-disable-next-line no-bitwise
     hash |= 0;
   }
-  return `${hash.toString(16)}`;
+  return `${(hash < 0 ? hash * -1 : hash).toString(16)}`;
 }
 
 export const addWord = async (...[word]: AddWordArgs) => {
diff --git a/packages/cwait/src/onchain/executor.ts b/packages/cwait/src/onchain/executor.ts
index 280d9c5..f57fb2f 100644
--- a/packages/cwait/src/onchain/executor.ts
+++ b/packages/cwait/src/onchain/executor.ts
@@ -10,8 +10,8 @@ import {
 import { getCallParameters, queue } from 'lib/onchain';
 
 import { context, getRawContext, setRawContext } from './context';
-import { getAwaitedOps } from './ops/awaited';
-import { pushResolvedOp } from './ops/resolved';
+import { getAwaitedOps } from './promisifedOps/awaited';
+import { pushResolvedOp } from './promisifedOps/resolved';
 
 let abortExecution: (() => void) | null = null;
 
diff --git a/packages/cwait/src/onchain/index.ts b/packages/cwait/src/onchain/index.ts
index 5e5fb69..b391dad 100644
--- a/packages/cwait/src/onchain/index.ts
+++ b/packages/cwait/src/onchain/index.ts
@@ -1,3 +1,3 @@
 export * from './context';
 export * from './executor';
-export * from './ops';
+export * from './promisifedOps';
diff --git a/packages/cwait/src/onchain/ops/awaited.ts b/packages/cwait/src/onchain/promisifedOps/awaited.ts
similarity index 100%
rename from packages/cwait/src/onchain/ops/awaited.ts
rename to packages/cwait/src/onchain/promisifedOps/awaited.ts
diff --git a/packages/cwait/src/onchain/promisifedOps/index.ts b/packages/cwait/src/onchain/promisifedOps/index.ts
new file mode 100644
index 0000000..854cc7e
--- /dev/null
+++ b/packages/cwait/src/onchain/promisifedOps/index.ts
@@ -0,0 +1,3 @@
+export * from './awaited';
+export * from './resolved';
+export * from './ops';
diff --git a/packages/cwait/src/onchain/ops/block.ts b/packages/cwait/src/onchain/promisifedOps/ops/block.ts
similarity index 86%
rename from packages/cwait/src/onchain/ops/block.ts
rename to packages/cwait/src/onchain/promisifedOps/ops/block.ts
index 330af13..8bc3b1a 100644
--- a/packages/cwait/src/onchain/ops/block.ts
+++ b/packages/cwait/src/onchain/promisifedOps/ops/block.ts
@@ -1,7 +1,7 @@
 import { BlockFilter, constructBlock, extractBlock, isResolvedBlock } from '@coinweb/contract-kit';
 
-import { pushAwaitedOp } from './awaited';
-import { shiftResolvedOp } from './resolved';
+import { pushAwaitedOp } from '../awaited';
+import { shiftResolvedOp } from '../resolved';
 
 export const blockOp = (filters: BlockFilter[]) =>
   new Promise<[BlockFilter, boolean][] | null>((resolve, reject) => {
diff --git a/packages/cwait/src/onchain/ops/index.ts b/packages/cwait/src/onchain/promisifedOps/ops/index.ts
similarity index 64%
rename from packages/cwait/src/onchain/ops/index.ts
rename to packages/cwait/src/onchain/promisifedOps/ops/index.ts
index 3c9ab12..f8157f9 100644
--- a/packages/cwait/src/onchain/ops/index.ts
+++ b/packages/cwait/src/onchain/promisifedOps/ops/index.ts
@@ -1,6 +1,5 @@
-export * from './awaited';
 export * from './block';
+export * from './rangeRead';
 export * from './read';
-export * from './resolved';
 export * from './store';
 export * from './take';
diff --git a/packages/cwait/src/onchain/ops/rangeRead.ts b/packages/cwait/src/onchain/promisifedOps/ops/rangeRead.ts
similarity index 83%
rename from packages/cwait/src/onchain/ops/rangeRead.ts
rename to packages/cwait/src/onchain/promisifedOps/ops/rangeRead.ts
index 7cad24e..18ecb62 100644
--- a/packages/cwait/src/onchain/ops/rangeRead.ts
+++ b/packages/cwait/src/onchain/promisifedOps/ops/rangeRead.ts
@@ -1,11 +1,10 @@
 import { Claim, ClaimKey, constructRangeRead, extractRead, isResolvedRead } from '@coinweb/contract-kit';
 import { ClaimRange } from '@coinweb/contract-kit/dist/types/operations/read';
 
-import { TypedClaim } from '../../types';
-import { context } from '../context';
-
-import { pushAwaitedOp } from './awaited';
-import { shiftResolvedOp } from './resolved';
+import { TypedClaim } from '../../../types';
+import { context } from '../../context';
+import { pushAwaitedOp } from '../awaited';
+import { shiftResolvedOp } from '../resolved';
 
 export const rangeReadOp = <TClaims extends Claim[] = TypedClaim[]>(
   firstPart: ClaimKey['first_part'],
diff --git a/packages/cwait/src/onchain/ops/read.ts b/packages/cwait/src/onchain/promisifedOps/ops/read.ts
similarity index 79%
rename from packages/cwait/src/onchain/ops/read.ts
rename to packages/cwait/src/onchain/promisifedOps/ops/read.ts
index cad65a0..27f4d36 100644
--- a/packages/cwait/src/onchain/ops/read.ts
+++ b/packages/cwait/src/onchain/promisifedOps/ops/read.ts
@@ -1,10 +1,9 @@
 import { Claim, ClaimKey, constructRead, extractRead, isResolvedRead } from '@coinweb/contract-kit';
 
-import { TypedClaim } from '../../types';
-import { context } from '../context';
-
-import { pushAwaitedOp } from './awaited';
-import { shiftResolvedOp } from './resolved';
+import { TypedClaim } from '../../../types';
+import { context } from '../../context';
+import { pushAwaitedOp } from '../awaited';
+import { shiftResolvedOp } from '../resolved';
 
 export const readOp = <TClaim extends Claim = TypedClaim>(key: ClaimKey) => {
   return new Promise<TClaim | null>((resolve, reject) => {
diff --git a/packages/cwait/src/onchain/ops/store.ts b/packages/cwait/src/onchain/promisifedOps/ops/store.ts
similarity index 87%
rename from packages/cwait/src/onchain/ops/store.ts
rename to packages/cwait/src/onchain/promisifedOps/ops/store.ts
index f42ce34..a38e15b 100644
--- a/packages/cwait/src/onchain/ops/store.ts
+++ b/packages/cwait/src/onchain/promisifedOps/ops/store.ts
@@ -1,8 +1,8 @@
 import { Claim, constructStore, isResolvedStore } from '@coinweb/contract-kit';
 import { extractStore } from '@coinweb/contract-kit/dist/esm/operations/store';
 
-import { pushAwaitedOp } from './awaited';
-import { shiftResolvedOp } from './resolved';
+import { pushAwaitedOp } from '../awaited';
+import { shiftResolvedOp } from '../resolved';
 
 export const storeOp = (claim: Claim) =>
   new Promise<Claim | null>((resolve, reject) => {
diff --git a/packages/cwait/src/onchain/ops/take.ts b/packages/cwait/src/onchain/promisifedOps/ops/take.ts
similarity index 82%
rename from packages/cwait/src/onchain/ops/take.ts
rename to packages/cwait/src/onchain/promisifedOps/ops/take.ts
index 611b8c8..3c916f7 100644
--- a/packages/cwait/src/onchain/ops/take.ts
+++ b/packages/cwait/src/onchain/promisifedOps/ops/take.ts
@@ -1,9 +1,8 @@
 import { constructTake, extractTake, isResolvedTake, Claim, ClaimKey } from '@coinweb/contract-kit';
 
-import { TypedClaim } from '../../types';
-
-import { pushAwaitedOp } from './awaited';
-import { shiftResolvedOp } from './resolved';
+import { TypedClaim } from '../../../types';
+import { pushAwaitedOp } from '../awaited';
+import { shiftResolvedOp } from '../resolved';
 
 export const takeOp = <TClaim extends Claim = TypedClaim>(key: ClaimKey) =>
   new Promise<TClaim | null>((resolve, reject) => {
diff --git a/packages/cwait/src/onchain/ops/resolved.ts b/packages/cwait/src/onchain/promisifedOps/resolved.ts
similarity index 100%
rename from packages/cwait/src/onchain/ops/resolved.ts
rename to packages/cwait/src/onchain/promisifedOps/resolved.ts