Merge pull request #64 from firstbatchxyz/erhant/parcel-rfk

Parcel refactor

Author: anilaltuner

.gitignore

@@ -23,3 +23,5 @@ tmp.ts
 
 # Test stuff
 coverage
+
+.vscode

.vscode/settings.json

@@ -23,13 +23,19 @@
   "targets": {
     "cjs": {
       "outputFormat": "commonjs",
-      "isLibrary": true,
-      "context": "node"
+      "isLibrary": false,
+      "context": "node",
+      "scopeHoist": false,
+      "includeNodeModules": false,
+      "optimize": false
     },
     "mjs": {
       "outputFormat": "esmodule",
-      "isLibrary": true,
-      "context": "node"
+      "isLibrary": false,
+      "context": "node",
+      "scopeHoist": false,
+      "includeNodeModules": false,
+      "optimize": false
     }
   },
   "engines": {

package.json

@@ -7,7 +7,7 @@ import type {
   UpdateWhitelistInput,
   OpitonalArray,
 } from '../contracts/types';
-import {Base} from './base';
+import type {Base} from './base';
 
 export class Admin<M extends ContractMode = ContractMode> {
   constructor(private readonly base: Base<M>) {}
@@ -25,9 +25,6 @@ export class Admin<M extends ContractMode = ContractMode> {
     });
   }
 
-  // TODO: transfer ownership
-  // remove yourself from whitelists and such
-
   /**
    * Changes the whitelist for the selected list.
    * @param users an array of user addresses

src/base/admin.ts

@@ -1,4 +1,4 @@
-import {Warp, Contract, ArWallet, CustomSignature} from 'warp-contracts';
+import {Warp, Contract, ArWallet, type CustomSignature} from 'warp-contracts';
 import {SnarkjsExtension} from 'warp-contracts-plugin-snarkjs';
 import {EthersExtension} from 'warp-contracts-plugin-ethers';
 import type {ContractInputGeneric, ContractMode, ContractState} from '../contracts/types/contract';

src/base/base.ts

@@ -1,4 +1,4 @@
-import {JWKInterface, Warp} from 'warp-contracts';
+import type {JWKInterface, Warp} from 'warp-contracts';
 import {ArweaveSigner} from 'warp-contracts-plugin-deploy';
 
 /** Evolve an existing contract with a new source code. */

src/bin/evolve.ts

@@ -1,5 +1,6 @@
 import {readFileSync} from 'fs';
-import {JWKInterface, Warp, WarpFactory} from 'warp-contracts';
+import type {JWKInterface, Warp} from 'warp-contracts';
+import {WarpFactory} from 'warp-contracts';
 import {DeployPlugin} from 'warp-contracts-plugin-deploy';
 import {prepareState as prepareStateWithWarp} from './deploy';
 import {ContractState} from '../contracts/types';

src/bin/utils.ts

@@ -8,3 +8,4 @@ The tests are as follows:
 - `crud` tests for basic CRUD functionality, such as checking for existing keys, not removing an already removed key and such.
 - `htx` tests use a custom contract where assume Bundlr usage and instead of values themselves, we store `valueHash.txid` as values.
 - `multi` tests using a single Warp instance with multiple contracts, and multiple HollowDB instances.
+- `null` tests null values, which are not allowed due to ambiguity between a null value and non-existent value.

tests/README.md

@@ -3,7 +3,7 @@ import {LoggerFactory, Warp, WarpFactory} from 'warp-contracts';
 import {DeployPlugin} from 'warp-contracts-plugin-deploy';
 import {Redis} from 'ioredis';
 import {overrideCache} from '../utils/cache';
-import {Wallet} from 'warp-contracts/lib/types/contract/testing/Testing';
+import type {Wallet} from 'warp-contracts/lib/types/contract/testing/Testing';
 
 /**
  * Setup Warp instance for a test, connected to Arlocal at the provided port.

tests/hooks/index.ts

@@ -1,8 +1,8 @@
+import type {Warp, JWKInterface} from 'warp-contracts';
 import {randomBytes} from 'crypto';
-import {Warp, JWKInterface} from 'warp-contracts';
 import {readFileSync} from 'fs';
-import {deploy} from '../../src/bin/deploy';
 import {computeKey} from 'hollowdb-prover';
+import {deploy} from '../../src/bin/deploy';
 import {ContractState} from '../../src/contracts/types';
 
 /** Add funds to any wallet. */