feat: wip allow the initial state to be stored as MsgPack binary

warp-contracts · Dec 19, 2022 · 8355d89 · 8355d89
1 parent 44d73b8
commit 8355d89
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/src/contract/deploy/CreateContract.ts b/src/contract/deploy/CreateContract.ts
@@ -20,7 +20,7 @@ export const emptyTransfer: ArTransfer = {
 
 export interface CommonContractData {
   wallet: ArWallet | SignatureType;
-  initState: string;
+  initState: string | Buffer;
   tags?: Tags;
   transfer?: ArTransfer;
   data?: {

diff --git a/src/contract/deploy/impl/DefaultCreateContract.ts b/src/contract/deploy/impl/DefaultCreateContract.ts
@@ -85,7 +85,10 @@ export class DefaultCreateContract implements CreateContract {
     contractTX.addTag(SmartWeaveTags.SDK, 'RedStone');
     if (data) {
       contractTX.addTag(SmartWeaveTags.CONTENT_TYPE, data['Content-Type']);
-      contractTX.addTag(SmartWeaveTags.INIT_STATE, initState);
+      contractTX.addTag(
+        SmartWeaveTags.INIT_STATE,
+        typeof initState === 'string' ? initState : new TextDecoder().decode(initState)
+      );
     } else {
       contractTX.addTag(SmartWeaveTags.CONTENT_TYPE, 'application/json');
     }

diff --git a/src/core/modules/impl/ContractDefinitionLoader.ts b/src/core/modules/impl/ContractDefinitionLoader.ts
@@ -12,6 +12,7 @@ import { TagsParser } from './TagsParser';
 import { WasmSrc } from './wasm/WasmSrc';
 import { WarpEnvironment } from '../../Warp';
 import { SortKeyCache } from 'cache/SortKeyCache';
+import { unpack } from 'msgpackr';
 
 const supportedSrcContentTypes = ['application/javascript', 'application/wasm'];
 
@@ -55,9 +56,10 @@ export class ContractDefinitionLoader implements DefinitionLoader {
     const minFee = this.tagsParser.getTag(contractTx, SmartWeaveTags.MIN_FEE);
     this.logger.debug('Tags decoding', benchmark.elapsed());
     benchmark.reset();
-    const s = await this.evalInitialState(contractTx);
-    this.logger.debug('init state', s);
-    const initState = JSON.parse(await this.evalInitialState(contractTx));
+    // TODO: It should be stored somewhere whether the initial state is stored as a JSON string or
+    // as a MsgPack binary. For the sake of this experiment, we assume it's always MsgPack.
+    // const initState = JSON.parse(await this.evalInitialState(contractTx));
+    const initState = unpack(await this.arweaveWrapper.txData(contractTx.id));
     this.logger.debug('Parsing src and init state', benchmark.elapsed());
 
     const { src, srcBinary, srcWasmLang, contractType, metadata, srcTx } = await this.loadContractSource(