feat: replace DataItem and Signer classes with warp-arbundles impleme…

…ntation (#434)
warp-contracts · Jun 30, 2023 · 0863c25 · 0863c25
1 parent 2c68d7c
commit 0863c25
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 50 deletions.
diff --git a/src/contract/HandlerBasedContract.ts b/src/contract/HandlerBasedContract.ts
@@ -402,7 +402,6 @@ export class HandlerBasedContract<State> implements Contract<State> {
       await interactionDataItem.sign(bundlerSigner);
     }
 
-    // TODO: for ethereum owner is set to public key and not the address!!
     if (!this._evaluationOptions.internalWrites && strict) {
       await this.checkInteractionInStrictMode(interactionDataItem.owner, input, tags, transfer, strict, vrf);
     }

diff --git a/src/contract/deploy/CreateContract.ts b/src/contract/deploy/CreateContract.ts
@@ -2,7 +2,7 @@ import { JWKInterface } from 'arweave/node/lib/wallet';
 import { WarpPluginType } from '../../core/WarpPlugin';
 import { EvaluationOptions } from '../../core/modules/StateEvaluator';
 import { Source } from './Source';
-import { BundlerSigner } from './DataItem';
+import { Signer } from 'warp-arbundles';
 import { CustomSignature } from '../Signature';
 import { Tag } from '../../utils/types/arweave-types';
 
@@ -31,13 +31,13 @@ export const BUNDLR_NODES = ['node1', 'node2'] as const;
 export type BundlrNodeType = (typeof BUNDLR_NODES)[number];
 
 export interface CommonContractData {
-  wallet: ArWallet | CustomSignature | BundlerSigner;
+  wallet: ArWallet | CustomSignature | Signer;
   initState: string;
   tags?: Tags;
   transfer?: ArTransfer;
   data?: {
     'Content-Type': string;
-    body: string | Uint8Array;
+    body: string | Buffer;
   };
   evaluationManifest?: EvaluationManifest;
 }

diff --git a/src/contract/deploy/DataItem.ts b/src/contract/deploy/DataItem.ts
diff --git a/src/contract/deploy/Source.ts b/src/contract/deploy/Source.ts
@@ -1,7 +1,7 @@
 import { ArWallet } from './CreateContract';
 import { CustomSignature } from '../../contract/Signature';
 import { Transaction } from '../../utils/types/arweave-types';
-import { BundlerSigner, DataItem } from './DataItem';
+import { Signer, DataItem } from 'warp-arbundles';
 
 export interface SourceData {
   src: string | Buffer;
@@ -23,7 +23,7 @@ export interface Source {
    */
   createSource(
     sourceData: SourceData,
-    wallet: ArWallet | CustomSignature | BundlerSigner,
+    wallet: ArWallet | CustomSignature | Signer,
     disableBundling?: boolean
   ): Promise<DataItem | Transaction>;
 

diff --git a/src/core/Warp.ts b/src/core/Warp.ts
@@ -32,7 +32,7 @@ import { Transaction } from '../utils/types/arweave-types';
 import { DEFAULT_LEVEL_DB_LOCATION, WARP_GW_URL } from './WarpFactory';
 import { LevelDbCache } from '../cache/impl/LevelDbCache';
 import { SourceData } from '../contract/deploy/Source';
-import { BundlerSigner, DataItem } from '../contract/deploy/DataItem';
+import { Signer, DataItem } from 'warp-arbundles';
 import { BasicSortKeyCache } from '../cache/BasicSortKeyCache';
 
 export type WarpEnvironment = 'local' | 'testnet' | 'mainnet' | 'custom';
@@ -121,7 +121,7 @@ export class Warp {
 
   async createSource(
     sourceData: SourceData,
-    wallet: ArWallet | CustomSignature | BundlerSigner,
+    wallet: ArWallet | CustomSignature | Signer,
     disableBundling = false
   ): Promise<Transaction | DataItem> {
     return await this.createContract.createSource(sourceData, wallet, disableBundling);

diff --git a/src/index.ts b/src/index.ts
@@ -53,7 +53,6 @@ export * from './contract/Signature';
 export * from './contract/EvaluationOptionsEvaluator';
 export * from './contract/deploy/Source';
 export * from './contract/deploy/CreateContract';
-export * from './contract/deploy/DataItem';
 
 export * from './legacy/gqlResult';
 export * from './legacy/smartweave-global';