@show-karma/karma-gap-sdk 0.3.33 → 0.3.35

package/core/class/GrantProgramRegistry/Allo.d.ts

@@ -1,16 +1,17 @@
 import { ethers } from "ethers";
-import pinataSDK from "@pinata/sdk";
 export declare class AlloBase {
     private signer;
     private contract;
-    private static ipfsClient;
     private allo;
-    constructor(signer: ethers.Signer, ipfsStorage: pinataSDK, chainId: number);
-    saveAndGetCID(data: any): Promise<string>;
+    private pinataJWTToken;
+    constructor(signer: ethers.Signer, pinataJWTToken: string, chainId: number);
+    saveAndGetCID(data: any, pinataMetadata?: {
+        name: string;
+    }): Promise<any>;
     encodeStrategyInitData(applicationStart: number, applicationEnd: number, roundStart: number, roundEnd: number, payoutToken: string): Promise<string>;
-    createGrant(args: any): Promise<{
+    createGrant(args: any, callback?: Function): Promise<{
         poolId: string;
         txHash: string;
     }>;
-    updatePoolMetadata(poolId: string, poolMetadata: any): Promise<any>;
+    updatePoolMetadata(poolId: string, poolMetadata: any, callback?: Function): Promise<any>;
 }

package/core/class/GrantProgramRegistry/Allo.js

@@ -9,20 +9,29 @@ const Allo_json_1 = __importDefault(require("../../abi/Allo.json"));
 const consts_1 = require("../../consts");
 const ethers_2 = require("ethers");
 const allo_v2_sdk_1 = require("@allo-team/allo-v2-sdk/");
+const axios_1 = __importDefault(require("axios"));
 class AlloBase {
-    constructor(signer, ipfsStorage, chainId) {
+    constructor(signer, pinataJWTToken, chainId) {
         this.signer = signer;
         this.contract = new ethers_1.ethers.Contract(consts_1.AlloContracts.alloProxy, Allo_json_1.default, signer);
         this.allo = new allo_v2_sdk_1.Allo({ chain: chainId });
-        AlloBase.ipfsClient = ipfsStorage;
+        this.pinataJWTToken = pinataJWTToken;
     }
-    async saveAndGetCID(data) {
+    async saveAndGetCID(data, pinataMetadata = { name: "via karma-gap-sdk" }) {
         try {
-            const res = await AlloBase.ipfsClient.pinJSONToIPFS(data);
-            return res.IpfsHash;
+            const res = await axios_1.default.post("https://api.pinata.cloud/pinning/pinJSONToIPFS", {
+                pinataContent: data,
+                pinataMetadata: pinataMetadata,
+            }, {
+                headers: {
+                    "Content-Type": "application/json",
+                    Authorization: `Bearer ${this.pinataJWTToken}`,
+                },
+            });
+            return res.data.IpfsHash;
         }
         catch (error) {
-            throw new Error(`Error adding data to IPFS: ${error}`);
+            console.log(error);
         }
     }
     async encodeStrategyInitData(applicationStart, applicationEnd, roundStart, roundEnd, payoutToken) {
@@ -38,7 +47,7 @@ class AlloBase {
         ]);
         return initStrategyData;
     }
-    async createGrant(args) {
+    async createGrant(args, callback) {
         console.log("Creating grant...");
         const walletBalance = await this.signer.provider.getBalance(await this.signer.getAddress());
         console.log("Wallet balance:", (0, ethers_1.formatEther)(walletBalance.toString()), " ETH");
@@ -61,13 +70,16 @@ class AlloBase {
                 metadata: metadata,
                 managers: args.managers,
             };
+            callback?.("preparing");
             const txData = this.allo.createPool(createPoolArgs);
             const tx = await this.signer.sendTransaction({
                 data: txData.data,
                 to: txData.to,
                 value: BigInt(txData.value),
             });
+            callback?.("pending");
             const receipt = await tx.wait();
+            callback?.("confirmed");
             // Get ProfileCreated event
             const poolId = receipt.logs[receipt.logs.length - 1].topics[0];
             return {
@@ -79,15 +91,18 @@ class AlloBase {
             console.error(`Failed to create pool: ${error}`);
         }
     }
-    async updatePoolMetadata(poolId, poolMetadata) {
+    async updatePoolMetadata(poolId, poolMetadata, callback) {
         try {
+            callback?.("preparing");
             const metadata_cid = await this.saveAndGetCID(poolMetadata);
             const metadata = {
                 protocol: 1,
                 pointer: metadata_cid,
             };
             const tx = await this.contract.updatePoolMetadata(poolId, metadata);
+            callback?.("pending");
             const receipt = await tx.wait();
+            callback?.("confirmed");
             return receipt;
         }
         catch (error) {

package/core/class/GrantProgramRegistry/AlloRegistry.d.ts

@@ -1,11 +1,12 @@
 import { ethers } from "ethers";
 import { ProfileMetadata } from "../types/allo";
-import pinataSDK from "@pinata/sdk";
 export declare class AlloRegistry {
     private contract;
-    private static ipfsClient;
-    constructor(signer: ethers.Signer, ipfsStorage: pinataSDK);
-    saveAndGetCID(data: any): Promise<string>;
+    private pinataJWTToken;
+    constructor(signer: ethers.Signer, pinataJWTToken: string);
+    saveAndGetCID(data: any, pinataMetadata?: {
+        name: string;
+    }): Promise<any>;
     createProgram(nonce: number, name: string, profileMetadata: ProfileMetadata, owner: string, members: string[]): Promise<{
         profileId: any;
         txHash: any;

package/core/class/GrantProgramRegistry/AlloRegistry.js

@@ -7,18 +7,27 @@ exports.AlloRegistry = void 0;
 const ethers_1 = require("ethers");
 const AlloRegistry_json_1 = __importDefault(require("../../abi/AlloRegistry.json"));
 const consts_1 = require("../../consts");
+const axios_1 = __importDefault(require("axios"));
 class AlloRegistry {
-    constructor(signer, ipfsStorage) {
+    constructor(signer, pinataJWTToken) {
         this.contract = new ethers_1.ethers.Contract(consts_1.AlloContracts.registry, AlloRegistry_json_1.default, signer);
-        AlloRegistry.ipfsClient = ipfsStorage;
+        this.pinataJWTToken = pinataJWTToken;
     }
-    async saveAndGetCID(data) {
+    async saveAndGetCID(data, pinataMetadata = { name: "via karma-gap-sdk" }) {
         try {
-            const res = await AlloRegistry.ipfsClient.pinJSONToIPFS(data);
-            return res.IpfsHash;
+            const res = await axios_1.default.post("https://api.pinata.cloud/pinning/pinJSONToIPFS", {
+                pinataContent: data,
+                pinataMetadata: pinataMetadata,
+            }, {
+                headers: {
+                    "Content-Type": "application/json",
+                    Authorization: `Bearer ${this.pinataJWTToken}`,
+                },
+            });
+            return res.data.IpfsHash;
         }
         catch (error) {
-            throw new Error(`Error adding data to IPFS: ${error}`);
+            console.log(error);
         }
     }
     async createProgram(nonce, name, profileMetadata, owner, members) {

package/core/class/remote-storage/IpfsStorage.d.ts

@@ -1,10 +1,10 @@
-import pinataSDK from "@pinata/sdk";
 import { RemoteStorage } from "./RemoteStorage";
 import { TRemoteStorageOutput } from "core/types";
 export interface IpfsStorageOptions {
     token: string;
 }
-export declare class IpfsStorage extends RemoteStorage<pinataSDK> {
+export declare class IpfsStorage extends RemoteStorage {
+    private pinataJWTToken;
     constructor(opts: IpfsStorageOptions, 
     /**
      * If set, will send request to another server instead of
@@ -17,4 +17,7 @@ export declare class IpfsStorage extends RemoteStorage<pinataSDK> {
     get<T = unknown>(args: {
         cid: string;
     }): Promise<T>;
+    saveAndGetCID(data: any, pinataMetadata?: {
+        name: string;
+    }): Promise<any>;
 }

package/core/class/remote-storage/IpfsStorage.js

@@ -4,10 +4,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IpfsStorage = void 0;
-const sdk_1 = __importDefault(require("@pinata/sdk"));
 const RemoteStorage_1 = require("./RemoteStorage");
 const SchemaError_1 = require("../SchemaError");
 const utils_1 = require("../../utils");
+const axios_1 = __importDefault(require("axios"));
 class IpfsStorage extends RemoteStorage_1.RemoteStorage {
     constructor(opts, 
     /**
@@ -17,13 +17,13 @@ class IpfsStorage extends RemoteStorage_1.RemoteStorage {
     sponsor) {
         super(0 /* STORAGE_TYPE.IPFS */, sponsor);
         this.assert(opts);
-        this.client = new sdk_1.default({ pinataJWTKey: opts.token });
+        this.pinataJWTToken = opts.token;
     }
     assert(opts) { }
     async save(data) {
         try {
-            const res = await this.client.pinJSONToIPFS(data);
-            return res.IpfsHash;
+            const cid = await this.saveAndGetCID(data);
+            return cid;
         }
         catch (error) {
             throw new SchemaError_1.RemoteStorageError("REMOTE_STORAGE_UPLOAD", `Error adding data to IPFS`);
@@ -35,5 +35,22 @@ class IpfsStorage extends RemoteStorage_1.RemoteStorage {
     async get(args) {
         return (0, utils_1.getIPFSData)(args.cid);
     }
+    async saveAndGetCID(data, pinataMetadata = { name: "via karma-gap-sdk" }) {
+        try {
+            const res = await axios_1.default.post("https://api.pinata.cloud/pinning/pinJSONToIPFS", {
+                pinataContent: data,
+                pinataMetadata: pinataMetadata,
+            }, {
+                headers: {
+                    "Content-Type": "application/json",
+                    Authorization: `Bearer ${this.pinataJWTToken}`,
+                },
+            });
+            return res.data.IpfsHash;
+        }
+        catch (error) {
+            console.log(error);
+        }
+    }
 }
 exports.IpfsStorage = IpfsStorage;

package/package.json

@@ -3,7 +3,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.3.33",
+    "version": "0.3.35",
     "description": "Simple and easy interface between EAS and Karma GAP.",
     "main": "./index.js",
     "author": "KarmaHQ",
@@ -22,7 +22,6 @@
         "@allo-team/allo-v2-sdk": "^1.0.63",
         "@ethereum-attestation-service/eas-sdk": "1.4.2",
         "@gelatonetwork/relay-sdk": "^5.2.0",
-        "@pinata/sdk": "^2.1.0",
         "@types/sha256": "^0.2.0",
         "axios": "^1.4.0",
         "ethers": "6.11.0",