feat: switch to ANS-104

common/core/package.json

@@ -20,9 +20,9 @@
   "types": "dist/index",
   "dependencies": {
     "@kyve/contract-lib": "0.1.0-alpha.14",
+    "ans104": "joshbenaron/ans104",
     "ardb": "^1.0.8",
-    "arweave": "^1.10.11",
-    "arweave-bundles": "^1.0.3",
+    "arweave": "^1.10.15",
     "chalk": "^4.1.1",
     "fecha": "^4.2.1",
     "object-hash": "^2.2.0",

common/core/src/extensions.ts

@@ -1,15 +1,7 @@
-import deepHash from "arweave/node/lib/deepHash";
 import Arweave from "arweave";
-import ArweaveBundles from "arweave-bundles";
 
 export const arweaveClient = new Arweave({
   host: "arweave.net",
   port: 443,
   protocol: "https",
 });
-
-export const arweaveBundles = ArweaveBundles({
-  utils: Arweave.utils,
-  crypto: Arweave.crypto,
-  deepHash,
-});

common/core/src/index.ts

@@ -11,14 +11,15 @@ import {
 import { JWKInterface } from "arweave/node/lib/wallet";
 import hash from "object-hash";
 import { Observable } from "rxjs";
-import { arweaveBundles as bundles, arweaveClient } from "./extensions";
+import { arweaveClient } from "./extensions";
+import { DataItemCreateOptions } from "ans104/lib/ar-data-base";
+import { bundleAndSignData } from "ans104";
 
 import { Pool, Governance } from "@kyve/contract-lib";
 import { GQLEdgeTransactionInterface } from "ardb/lib/faces/gql";
 import { deposit, untilMined } from "./helper";
 
 import Log from "./logger";
-import { create } from "arweave-bundles";
 
 export const APP_NAME = "KYVE - DEV";
 
@@ -239,31 +240,21 @@ export default class KYVE {
         const buffer = this.uploaderBuffer;
         this.uploaderBuffer = [];
 
-        const items = [];
+        const items: DataItemCreateOptions[] = [];
         for (const entry of buffer) {
-          const item = await bundles.createData(
-            {
-              data: JSON.stringify(entry.data),
-              tags: [
-                { name: "Application", value: APP_NAME },
-                { name: "Pool", value: this.poolID.toString() },
-                ...(entry.tags || []),
-              ],
-            },
-            this.keyfile
-          );
-          items.push(await bundles.sign(item, this.keyfile));
+          items.push({
+            data: JSON.stringify(entry.data),
+            tags: [
+              { name: "Application", value: APP_NAME },
+              { name: "Pool", value: this.poolID.toString() },
+              ...(entry.tags || []),
+            ],
+          });
         }
 
-        const bundle = await bundles.bundleData(items);
-        const transaction = await this.arweave.createTransaction(
-          { data: JSON.stringify(bundle) },
-          this.keyfile
-        );
+        const bundle = await bundleAndSignData(items, this.keyfile);
+        const transaction = await bundle.toTransaction(this.arweave);
 
-        transaction.addTag("Bundle-Format", "json");
-        transaction.addTag("Bundle-Version", "1.0.0");
-        transaction.addTag("Content-Type", "application/json");
         transaction.addTag("App-Name", "SmartWeaveAction");
         transaction.addTag("App-Version", "0.3.0");
         transaction.addTag("Contract", this.pool.id!);

contract/pool/package.json

@@ -19,6 +19,7 @@
     "esbuild": "^0.11.2"
   },
   "dependencies": {
+    "ans104": "joshbenaron/ans104",
     "arweave-bundles": "^1.0.3",
     "prando": "^6.0.1"
   }

contract/pool/src/modules/register.ts

@@ -1,5 +1,6 @@
 import { ActionInterface, StateInterface } from "../faces";
 import { DataItemJson } from "arweave-bundles";
+import { unbundleData } from "ans104";
 
 declare const ContractAssert: any;
 declare const SmartWeave: any;
@@ -17,7 +18,7 @@ export const Register = async (
     "Only the uploader can register data."
   );
 
-  const ids: string[] = [];
+  let ids: string[] = [];
   const tags = await GetTags(SmartWeave.transaction.id);
 
   if (
@@ -28,7 +29,7 @@ export const Register = async (
       (tag) => tag.name === "Bundle-Version" && tag.value === "1.0.0"
     ) > -1
   ) {
-    // Transaction is a bundle
+    // Transaction is an ANS-102 bundle
     const data = JSON.parse(
       await SmartWeave.unsafeClient.transactions.getData(
         SmartWeave.transaction.id,
@@ -38,6 +39,21 @@ export const Register = async (
 
     const items = data.items as DataItemJson[];
     items.forEach((item) => ids.push(item.id));
+  } else if (
+    tags.findIndex(
+      (tag) => tag.name === "Bundle-Format" && tag.value === "binary"
+    ) > -1 &&
+    tags.findIndex(
+      (tag) => tag.name === "Bundle-Version" && tag.value === "2.0.0"
+    ) > -1
+  ) {
+    // Transaction is an ANS-104 bundle
+    const data = await SmartWeave.unsafeClient.transactions.getData(
+      SmartWeave.transaction.id
+    );
+
+    const bundle = unbundleData(data);
+    ids = bundle.getIds();
   } else {
     // Transaction is not a bundle
     ids.push(SmartWeave.transaction.id);

integrations/node/src/index.ts

@@ -25,6 +25,7 @@ declare global {
   }
 }
 
+// @ts-ignore
 global.__rootdir__ = __dirname || process.cwd();
 
 if (process.env.SEND_STATISTICS) {
@@ -34,6 +35,7 @@ if (process.env.SEND_STATISTICS) {
     release: "node@" + process.env.npm_package_version,
     integrations: [
       new RewriteFrames({
+        // @ts-ignore
         root: global.__rootdir__,
       }),
     ],