@kynesyslabs/demosdk 1.2.0 → 1.4.0

package/build/websdk/DemosTransactions.js

@@ -31,7 +31,7 @@ const node_forge_1 = __importDefault(require("node-forge"));
 const demos_1 = require("./demos");
 const sha256_1 = require("./utils/sha256");
 const skeletons = __importStar(require("./utils/skeletons"));
-const DemosWebAuth_1 = require("./DemosWebAuth");
+const required_1 = require("./utils/required");
 exports.DemosTransactions = {
     // REVIEW All this part
     // NOTE A courtesy to get a skeleton of transactions
@@ -49,40 +49,39 @@ exports.DemosTransactions = {
         return thisTx;
     },
     // NOTE Signing a transaction after hashing it
-    sign: async function (raw_tx, private_key = null) {
-        // If necessary, the private key is loaded from the state
-        if (!private_key) {
-            const id = DemosWebAuth_1.DemosWebAuth.getInstance().keypair;
-            private_key = id.privateKey;
-            console.log('Private key loaded from state');
-        }
-        else {
-            console.log('Private key provided');
-        }
-        console.log(private_key);
-        // Setting the public key
-        raw_tx.content.from = DemosWebAuth_1.DemosWebAuth.getInstance().keypair.publicKey;
-        // Hashing the content of the transaction
+    /**
+     * Signs a transaction after hashing its content.
+     *
+     * @param raw_tx - The transaction to be signed.
+     * @param keypair - The keypair to use for signing.
+     * @returns A Promise that resolves to the signed transaction.
+     */
+    sign: async function (raw_tx, keypair) {
+        (0, required_1._required)(keypair, "Private key not provided");
+        // Set the public key in the transaction
+        raw_tx.content.from = keypair.publicKey;
+        // Hash the content of the transaction
         raw_tx.hash = await (0, sha256_1.sha256)(JSON.stringify(raw_tx.content));
-        // Signing the hash of the content
+        // Sign the hash of the content
         let signatureData = node_forge_1.default.pki.ed25519.sign({
             message: raw_tx.hash,
-            encoding: 'utf8',
-            privateKey: private_key
-        }); // REVIEW if it is working right
+            encoding: "utf8",
+            privateKey: keypair.privateKey,
+        });
+        // Set the signature in the transaction
         raw_tx.signature = {
-            type: 'ed25519',
-            data: signatureData
+            type: "ed25519",
+            data: signatureData,
         };
-        // TODO Remove debug: error checking
+        // Verify the signature (for debugging purposes)
         let verified = node_forge_1.default.pki.ed25519.verify({
             message: raw_tx.hash,
-            encoding: 'utf8',
+            encoding: "utf8",
             signature: signatureData,
-            publicKey: DemosWebAuth_1.DemosWebAuth.getInstance().keypair.publicKey
+            publicKey: keypair.publicKey,
         });
-        console.log('Signature verified: ' + verified);
-        return raw_tx; // Hashed and signed
+        console.log("Signature verified: " + verified);
+        return raw_tx; // Return the hashed and signed transaction
     },
     // NOTE Sending a transaction after signing it
     confirm: async function (signedPayload) {

package/build/websdk/DemosTransactions.js.map

@@ -1 +1 @@
-{"version":3,"file":"DemosTransactions.js","sourceRoot":"","sources":["../../../src/websdk/DemosTransactions.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4DAA8B;AAE9B,mCAA+B;AAC/B,2CAAuC;AACvC,6DAA8C;AAC9C,iDAA6C;AAIhC,QAAA,iBAAiB,GAAG;IAC/B,uBAAuB;IACvB,oDAAoD;IACpD,KAAK,EAAE;QACL,OAAO,SAAS,CAAC,WAAW,CAAA;IAC9B,CAAC;IACD,4DAA4D;IAC5D,OAAO,EAAE,KAAK,WAAW,OAAY,IAAI;QACvC,sDAAsD;QACtD,MAAM,MAAM,GAAG,SAAS,CAAC,WAAW,CAAA;QACpC,mDAAmD;QACnD,+CAA+C;QAC/C,IAAI,IAAI;YAAE,MAAM,CAAC,OAAO,CAAC,IAAI,GAAG,IAAI,CAAA;QACpC,OAAO,MAAM,CAAA;IACf,CAAC;IACD,8CAA8C;IAC9C,IAAI,EAAE,KAAK,WAAW,MAAmB,EAAE,cAAiC,IAAI;QAC9E,yDAAyD;QACzD,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,MAAM,EAAE,GAAG,2BAAY,CAAC,WAAW,EAAE,CAAC,OAAO,CAAA;YAC7C,WAAW,GAAG,EAAG,CAAC,UAAwB,CAAA;YAC1C,OAAO,CAAC,GAAG,CAAC,+BAA+B,CAAC,CAAA;QAC9C,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAA;QACrC,CAAC;QACD,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAA;QACxB,yBAAyB;QACzB,MAAM,CAAC,OAAO,CAAC,IAAI,GAAG,2BAAY,CAAC,WAAW,EAAE,CAAC,OAAQ,CAAC,SAAuB,CAAA;QACjF,yCAAyC;QACzC,MAAM,CAAC,IAAI,GAAG,MAAM,IAAA,eAAM,EAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAA;QAC1D,kCAAkC;QAClC,IAAI,aAAa,GAAG,oBAAK,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC;YACzC,OAAO,EAAE,MAAM,CAAC,IAAI;YACpB,QAAQ,EAAE,MAAM;YAChB,UAAU,EAAE,WAAW;SACxB,CAAC,CAAA,CAAC,gCAAgC;QACnC,MAAM,CAAC,SAAS,GAAG;YACjB,IAAI,EAAE,SAAS;YACf,IAAI,EAAE,aAAa;SACpB,CAAA;QACD,oCAAoC;QACpC,IAAI,QAAQ,GAAG,oBAAK,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC;YACtC,OAAO,EAAE,MAAM,CAAC,IAAI;YACpB,QAAQ,EAAE,MAAM;YAChB,SAAS,EAAE,aAAa;YACxB,SAAS,EAAE,2BAAY,CAAC,WAAW,EAAE,CAAC,OAAQ,CAAC,SAAuB;SACvE,CAAC,CAAA;QACF,OAAO,CAAC,GAAG,CAAC,sBAAsB,GAAG,QAAQ,CAAC,CAAA;QAE9C,OAAO,MAAM,CAAA,CAAC,oBAAoB;IACpC,CAAC;IACD,8CAA8C;IAC9C,OAAO,EAAE,KAAK,WAAW,aAA0B;QACjD,IAAI,QAAQ,GAAG,MAAM,aAAK,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;QAClD,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAChC,OAAO,QAAQ,CAAC;IAClB,CAAC;IACD,SAAS,EAAE,KAAK,WAAW,YAA0B;QACnD,yGAAyG;QACzG,yEAAyE;QACzE,IAAI,QAAQ,GAAG,MAAM,aAAK,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;QACnD,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAChC,OAAO,QAAQ,CAAC;IAClB,CAAC;CACF,CAAA"}
+{"version":3,"file":"DemosTransactions.js","sourceRoot":"","sources":["../../../src/websdk/DemosTransactions.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4DAA8B;AAE9B,mCAA+B;AAC/B,2CAAuC;AACvC,6DAA8C;AAG9C,+CAAwD;AAG3C,QAAA,iBAAiB,GAAG;IAC7B,uBAAuB;IACvB,oDAAoD;IACpD,KAAK,EAAE;QACH,OAAO,SAAS,CAAC,WAAW,CAAA;IAChC,CAAC;IACD,4DAA4D;IAC5D,OAAO,EAAE,KAAK,WAAW,OAAY,IAAI;QACrC,sDAAsD;QACtD,MAAM,MAAM,GAAG,SAAS,CAAC,WAAW,CAAA;QACpC,mDAAmD;QACnD,+CAA+C;QAC/C,IAAI,IAAI;YAAE,MAAM,CAAC,OAAO,CAAC,IAAI,GAAG,IAAI,CAAA;QACpC,OAAO,MAAM,CAAA;IACjB,CAAC;IACD,8CAA8C;IAC9C;;;;;;OAMG;IACH,IAAI,EAAE,KAAK,WACP,MAAmB,EACnB,OAAiB;QAEjB,IAAA,oBAAQ,EAAC,OAAO,EAAE,0BAA0B,CAAC,CAAA;QAE7C,wCAAwC;QACxC,MAAM,CAAC,OAAO,CAAC,IAAI,GAAG,OAAO,CAAC,SAAuB,CAAA;QAErD,sCAAsC;QACtC,MAAM,CAAC,IAAI,GAAG,MAAM,IAAA,eAAM,EAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAA;QAE1D,+BAA+B;QAC/B,IAAI,aAAa,GAAG,oBAAK,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC;YACvC,OAAO,EAAE,MAAM,CAAC,IAAI;YACpB,QAAQ,EAAE,MAAM;YAChB,UAAU,EAAE,OAAO,CAAC,UAAwB;SAC/C,CAAC,CAAA;QAEF,uCAAuC;QACvC,MAAM,CAAC,SAAS,GAAG;YACf,IAAI,EAAE,SAAS;YACf,IAAI,EAAE,aAAa;SACtB,CAAA;QAED,gDAAgD;QAChD,IAAI,QAAQ,GAAG,oBAAK,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC;YACpC,OAAO,EAAE,MAAM,CAAC,IAAI;YACpB,QAAQ,EAAE,MAAM;YAChB,SAAS,EAAE,aAAa;YACxB,SAAS,EAAE,OAAO,CAAC,SAAuB;SAC7C,CAAC,CAAA;QACF,OAAO,CAAC,GAAG,CAAC,sBAAsB,GAAG,QAAQ,CAAC,CAAA;QAE9C,OAAO,MAAM,CAAA,CAAC,2CAA2C;IAC7D,CAAC;IACD,8CAA8C;IAC9C,OAAO,EAAE,KAAK,WAAW,aAA0B;QAC/C,IAAI,QAAQ,GAAG,MAAM,aAAK,CAAC,OAAO,CAAC,aAAa,CAAC,CAAA;QACjD,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;QAC/B,OAAO,QAAQ,CAAA;IACnB,CAAC;IACD,SAAS,EAAE,KAAK,WAAW,YAA0B;QACjD,yGAAyG;QACzG,yEAAyE;QACzE,IAAI,QAAQ,GAAG,MAAM,aAAK,CAAC,SAAS,CAAC,YAAY,CAAC,CAAA;QAClD,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;QAC/B,OAAO,QAAQ,CAAA;IACnB,CAAC;CACJ,CAAA"}

package/build/websdk/DemosWebAuth.d.ts

@@ -15,7 +15,7 @@ export declare class DemosWebAuth {
      */
     static getInstance(): DemosWebAuth;
     create(seed?: string): Promise<{}[]>;
-    login(privKey: boolean | Uint8Array): Promise<(string | boolean)[]>;
+    login(privKey: string | boolean | Uint8Array): Promise<[boolean, string]>;
     /**
      * @description Disconnects a wallet from the Demos chain
      * @returns {Promise<[boolean, string]>}

package/build/websdk/DemosWebAuth.js.map

@@ -1 +1 @@
-{"version":3,"file":"DemosWebAuth.js","sourceRoot":"","sources":["../../../src/websdk/DemosWebAuth.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"DemosWebAuth.js","sourceRoot":"","sources":["../../../src/websdk/DemosWebAuth.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mCAAmC;AACnC,aAAa;AACb,4DAA+B;AAC/B,+CAA4C;AAC5C,yEAA2D;AAC3D,+BAA4B;AAG5B,+DAA+D;AAE/D,6EAA6E;AAC7E,kHAAkH;AAClH,MAAa,YAAY;IAMxB;QAJA,aAAQ,GAAG,KAAK,CAAC;QACjB,YAAO,GAAoB,IAAI,CAAC;QAChC,wBAAmB,GAA+B,IAAI,CAAC;QAGtD,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;QACtB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACpB,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC;IACjC,CAAC;IAED;;;;;;OAMG;IACH,MAAM,CAAC,WAAW;QACjB,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YACrB,IAAI,CAAC,SAAS,GAAG,IAAI,YAAY,EAAE,CAAC;QACrC,CAAC;QACD,OAAO,IAAI,CAAC,SAAS,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,IAAI,GAAG,EAAE;QACrB,IAAI,CAAC,IAAI,EAAE,CAAC;YACX,IAAI,GAAG,oBAAK,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;QACtC,CAAC;QACD,OAAO,CAAC,GAAG,CAAC,oCAAoC,CAAC,CAAC;QAClD,OAAO,CAAC,GAAG,CAAC,wBAAwB,GAAG,IAAI,CAAC,CAAC;QAC7C,IAAI,MAAM,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QACxB,IAAI,CAAC;YACJ,IAAI,CAAC,OAAO,GAAG;gBACd,UAAU,EAAE,IAAI;gBAChB,SAAS,EAAE,IAAI;aACf,CAAC;YACF,IAAI,CAAC,OAAO,GAAG,oBAAK,CAAC,GAAG,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;YAC3D,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC1B,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;YACrB,OAAO,CAAC,GAAG,CAAC,kCAAkC,CAAC,CAAC;YAChD,wBAAwB;YACxB,OAAO,CAAC,GAAG,CAAC,yCAAyC,CAAC,CAAC;YACvD,IAAI,CAAC,mBAAmB,GAAG;gBAC1B,UAAU,EAAE,eAAe,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC;gBAClE,SAAS,EAAE,eAAe,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC;aAChE,CAAC;YACF,MAAM,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,mBAAmB,CAAC,CAAC;YAC1C,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;QACvC,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACZ,mBAAmB;YACnB,MAAM,GAAG,CAAC,KAAK,EAAE,wBAAwB,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC;QACxD,CAAC;QACD,OAAO,MAAM,CAAC;IACf,CAAC;IAED,qFAAqF;IACrF,KAAK,CAAC,KAAK,CAAC,OAAsC;QACjD,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;YACjC,OAAO,CAAC,GAAG,CAAC,+CAA+C,CAAC,CAAC;YAC7D,OAAO,GAAG,eAAe,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;YACjD,IAAI,CAAC,OAAO,EAAE,CAAC;gBACd,OAAO,CAAC,KAAK,EAAE,8CAA8C,CAAC,CAAC;YAChE,CAAC;YACD,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YACrB,OAAO,CAAC,GAAG,CAAC,gCAAgC,CAAC,CAAC;QAC/C,CAAC;QACD,OAAO,CAAC,GAAG,CAAC,8BAA8B,CAAC,CAAC;QAC5C,IAAI,CAAC,IAAA,mBAAQ,EAAC,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC;YAC/B,OAAO,CAAC,KAAK,EAAE,oCAAoC,CAAC,CAAC;QACtD,CAAC;QACD,0CAA0C;QAE1C,2DAA2D;QAC3D,+FAA+F;QAC/F,uCAAuC;QAEvC,IAAI,CAAC,OAAO,GAAG;YACd,UAAU,EAAE,OAAqB;YACjC,SAAS,EAAE,IAAI;SACf,CAAC;QAEF,oDAAoD;QACpD,IAAI,CAAC;YACJ,OAAO,CAAC,GAAG,CAAC,wDAAwD,CAAC,CAAC;YACtE,IAAI,CAAC,OAAO,CAAC,SAAS,GAAG,oBAAK,CAAC,GAAG,CAAC,OAAO,CAAC,uBAAuB,CAAC,EAAE,UAAU,EAAE,OAAqB,EAAE,CAAC,CAAC;YAC1G,IAAI,CAAC,mBAAmB,GAAG;gBAC1B,UAAU,EAAE,eAAe,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC;gBAClE,SAAS,EAAE,eAAe,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC;aAChE,CAAC;YACF,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;YAErB,OAAO,CAAC,IAAI,EAAE,yBAAyB,CAAC,CAAC;QAC1C,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACZ,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YACf,OAAO,CAAC,KAAK,EAAE,wCAAwC,CAAC,CAAC;QAC1D,CAAC;IACF,CAAC;IAED;;;QAGI;IACJ,KAAK,CAAC,MAAM;QACX,IAAI,CAAC,IAAA,mBAAQ,EAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC;YACpC,OAAO,CAAC,IAAI,EAAE,6BAA6B,CAAC,CAAC;QAC9C,CAAC;QACD,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;QACtB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACpB,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC;QAChC,OAAO,CAAC,IAAI,EAAE,0BAA0B,CAAC,CAAC;IAC3C,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,OAAY;QACtB,IAAI,CAAC,IAAA,mBAAQ,EAAC,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,mBAAmB,EAAE,KAAK,CAAC,EAAE,CAAC;YAChE,OAAO,CAAC,KAAK,EAAE,0BAA0B,CAAC,CAAC;QAC5C,CAAC;QACD,iDAAiD;QACjD,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YACnB,OAAO,CAAC,GAAG,CAAC,oDAAoD,CAAC,CAAC;YAClE,IAAI,CAAC,OAAO,GAAG;gBACd,UAAU,EAAE,eAAe,CAAC,aAAa,CAAC,IAAI,CAAC,mBAAmB,EAAE,UAAU,CAAC;gBAC/E,SAAS,EAAE,eAAe,CAAC,aAAa,CAAC,IAAI,CAAC,mBAAmB,EAAE,SAAS,CAAC;aAC7E,CAAC;QACH,CAAC;QACD,IAAI,MAAM,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QACxB,IAAI,CAAC;YACJ,MAAM,WAAW,GAAG,oBAAK,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC;gBAC1C,OAAO,EAAE,OAAO;gBAChB,UAAU,EAAE,IAAI,CAAC,OAAQ,CAAC,UAAwB;aAClD,CAAC,CAAC;YAEH,MAAM,GAAG,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QAC9B,CAAC;QAAC,OAAO,CAAM,EAAE,CAAC;YACjB,MAAM,GAAG,CAAC,KAAK,EAAE,eAAe,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC;QAC/C,CAAC;QACD,OAAO,MAAM,CAAC,CAAC,iCAAiC;IACjD,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,OAAY,EAAE,WAAgB,EAAE,WAAgB;QAC5D,IAAI,MAAM,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QACxB,wCAAwC;QACxC,MAAM,SAAS,GAAG,eAAe,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;QAC7D,MAAM,SAAS,GAAG,eAAe,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;QAE7D,IAAI,CAAC,SAAS,EAAC,CAAC;YACf,OAAO,CAAC,KAAK,EAAE,mBAAmB,CAAC,CAAC;QACrC,CAAC;QAED,IAAI,CAAC,SAAS,EAAC,CAAC;YACf,OAAO,CAAC,KAAK,EAAE,oBAAoB,CAAC,CAAC;QACtC,CAAC;QAED,IAAI,CAAC;YACJ,MAAM,aAAa,GAAG,oBAAK,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC;gBAC9C,OAAO,EAAE,OAAO;gBAChB,SAAS,EAAE,SAAS;gBACpB,SAAS,EAAE,SAAS;aACpB,CAAC,CAAC;YAEH,MAAM,GAAG,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;QAChC,CAAC;QAAC,OAAO,CAAM,EAAE,CAAC;YACjB,MAAM,GAAG,CAAC,KAAK,EAAE,iBAAiB,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC;QACjD,CAAC;QACD,OAAO,MAAM,CAAC,CAAC,iCAAiC;IACjD,CAAC;IAED,GAAG;QACF,OAAO,SAAG,CAAC,WAAW,EAAE,CAAC;IAC1B,CAAC;;AA1KF,oCA2KC;AA1KO,sBAAS,GAAwB,IAAI,AAA5B,CAA6B;AA4K9C,+BAA+B"}

package/build/websdk/Web2Transactions.d.ts

@@ -1,2 +1,22 @@
-import type { Transaction } from '../types';
-export declare function prepareWeb2Payload(action?: string, url?: string, parameters?: any[], requestedParameters?: any, headers?: any, minAttestations?: number): Promise<Transaction>;
+import type { Transaction } from "../types";
+import { IKeyPair } from "./types/KeyPair";
+export interface IPrepareWeb2PayloadParams {
+    action: string;
+    url: string;
+    parameters?: any[];
+    headers?: any;
+    minAttestations?: number;
+}
+/**
+ * Prepares a Web2 payload for a transaction.
+ *
+ * @param {IPrepareWeb2PayloadParams} params - The parameters for the Web2 request.
+ * @param {string} params.action - The HTTP method (e.g., "GET", "POST").
+ * @param {string} params.url - The URL to send the request to.
+ * @param {any[]} params.parameters - Any parameters to be sent with the request.
+ * @param {any} params.headers - HTTP headers for the request (optional).
+ * @param {number} params.minAttestations - Minimum number of attestations required. Defaults to 2.
+ * @param {IKeyPair} keypair - The keypair of the sender.
+ * @returns {Promise<Transaction>} A promise that resolves to a signed transaction object.
+ */
+export declare function prepareWeb2Payload(params: IPrepareWeb2PayloadParams, keypair: IKeyPair): Promise<Transaction>;

package/build/websdk/Web2Transactions.js

@@ -28,28 +28,44 @@ exports.prepareWeb2Payload = prepareWeb2Payload;
 const skeletons = __importStar(require("./utils/skeletons"));
 // import demos from '../demos'
 const DemosTransactions_1 = require("./DemosTransactions");
-const DemosWebAuth_1 = require("./DemosWebAuth");
+const required_1 = require("./utils/required");
 // INFO Web2 Endpoints
-async function prepareWeb2Payload(action = 'GET', url = 'https://icanhazip.com', parameters = [], requestedParameters = null, headers = null, minAttestations = 2) {
+/**
+ * Prepares a Web2 payload for a transaction.
+ *
+ * @param {IPrepareWeb2PayloadParams} params - The parameters for the Web2 request.
+ * @param {string} params.action - The HTTP method (e.g., "GET", "POST").
+ * @param {string} params.url - The URL to send the request to.
+ * @param {any[]} params.parameters - Any parameters to be sent with the request.
+ * @param {any} params.headers - HTTP headers for the request (optional).
+ * @param {number} params.minAttestations - Minimum number of attestations required. Defaults to 2.
+ * @param {IKeyPair} keypair - The keypair of the sender.
+ * @returns {Promise<Transaction>} A promise that resolves to a signed transaction object.
+ */
+async function prepareWeb2Payload(params, keypair) {
+    (0, required_1._required)(params, "Invalid params");
+    (0, required_1._required)(params.url, "URL is required");
+    (0, required_1._required)(params.action, "Action not specified");
+    (0, required_1._required)(keypair, "Keypair is required");
     // Generating an empty one and filling it
     const web2_payload = skeletons.web2_request;
-    web2_payload.raw.action = action;
-    web2_payload.raw.url = url;
-    web2_payload.raw.parameters = parameters;
-    web2_payload.raw.headers = headers;
-    web2_payload.raw.minAttestations = minAttestations;
+    web2_payload.raw.action = params.action;
+    web2_payload.raw.url = params.url;
+    web2_payload.raw.parameters = params.parameters || [];
+    web2_payload.raw.headers = params.headers || null;
+    web2_payload.raw.minAttestations = params.minAttestations || 2;
     // Ensuring content is a known property
     web2_payload.attestations = new Map();
-    web2_payload.hash = '';
-    web2_payload.signature = '';
-    web2_payload.result = '';
-    console.log('[Web2Transactions] Payload:');
+    web2_payload.hash = "";
+    web2_payload.signature = "";
+    web2_payload.result = "";
+    console.log("[Web2Transactions] Payload:");
     console.log(web2_payload);
     // REVIEW Finish upgrading to the new transaction system
     // Creating a web2 payload
     let web2_tx = DemosTransactions_1.DemosTransactions.empty();
     // From and To are the same in Web2 transactions
-    web2_tx.content.from = DemosWebAuth_1.DemosWebAuth.getInstance().keypair.publicKey;
+    web2_tx.content.from = keypair.publicKey;
     web2_tx.content.to = web2_tx.content.from;
     // Setting the type and data
     web2_tx.content.type = "web2Request";
@@ -57,7 +73,7 @@ async function prepareWeb2Payload(action = 'GET', url = 'https://icanhazip.com',
     // Producing a timestamp
     web2_tx.content.timestamp = Date.now();
     // Signing the transaction
-    web2_tx = await DemosTransactions_1.DemosTransactions.sign(web2_tx);
+    web2_tx = await DemosTransactions_1.DemosTransactions.sign(web2_tx, keypair);
     // Returning the transaction
     return web2_tx;
 }

package/build/websdk/Web2Transactions.js.map

@@ -1 +1 @@
-{"version":3,"file":"Web2Transactions.js","sourceRoot":"","sources":["../../../src/websdk/Web2Transactions.ts"],"names":[],"mappings":";AAAA,gFAAgF;;;;;;;;;;;;;;;;;;;;;;;;;AAShF,gDAsCC;AA7CD,6DAA8C;AAC9C,+BAA+B;AAC/B,2DAAwD;AAExD,iDAA6C;AAE7C,sBAAsB;AACf,KAAK,UAAU,kBAAkB,CACtC,MAAM,GAAG,KAAK,EACd,GAAG,GAAG,uBAAuB,EAC7B,UAAU,GAAG,EAAE,EACf,mBAAmB,GAAG,IAAI,EAC1B,OAAO,GAAG,IAAI,EACd,eAAe,GAAG,CAAC;IAEnB,yCAAyC;IACzC,MAAM,YAAY,GAAgB,SAAS,CAAC,YAAY,CAAA;IACxD,YAAY,CAAC,GAAG,CAAC,MAAM,GAAG,MAAM,CAAA;IAChC,YAAY,CAAC,GAAG,CAAC,GAAG,GAAG,GAAG,CAAA;IAC1B,YAAY,CAAC,GAAG,CAAC,UAAU,GAAG,UAAU,CAAA;IACxC,YAAY,CAAC,GAAG,CAAC,OAAO,GAAG,OAAO,CAAA;IAClC,YAAY,CAAC,GAAG,CAAC,eAAe,GAAG,eAAe,CAAA;IAClD,uCAAuC;IACvC,YAAY,CAAC,YAAY,GAAG,IAAI,GAAG,EAAE,CAAA;IACrC,YAAY,CAAC,IAAI,GAAG,EAAE,CAAA;IACtB,YAAY,CAAC,SAAS,GAAG,EAAE,CAAA;IAC3B,YAAY,CAAC,MAAM,GAAG,EAAE,CAAA;IAExB,OAAO,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAA;IAC1C,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAA;IACzB,wDAAwD;IACxD,0BAA0B;IAC1B,IAAI,OAAO,GAAgB,qCAAiB,CAAC,KAAK,EAAE,CAAA;IACpD,gDAAgD;IAChD,OAAO,CAAC,OAAO,CAAC,IAAI,GAAG,2BAAY,CAAC,WAAW,EAAE,CAAC,OAAQ,CAAC,SAAuB,CAAA;IAClF,OAAO,CAAC,OAAO,CAAC,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,CAAA;IACzC,4BAA4B;IAC5B,OAAO,CAAC,OAAO,CAAC,IAAI,GAAG,aAAa,CAAA;IACpC,OAAO,CAAC,OAAO,CAAC,IAAI,GAAG,CAAC,aAAa,EAAE,YAAY,CAAC,CAAA;IACpD,wBAAwB;IACxB,OAAO,CAAC,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;IACtC,0BAA0B;IAC1B,OAAO,GAAG,MAAM,qCAAiB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IAC/C,4BAA4B;IAC5B,OAAO,OAAO,CAAA;AAChB,CAAC"}
+{"version":3,"file":"Web2Transactions.js","sourceRoot":"","sources":["../../../src/websdk/Web2Transactions.ts"],"names":[],"mappings":";AAAA,gFAAgF;;;;;;;;;;;;;;;;;;;;;;;;;AAgChF,gDAyCC;AAvED,6DAA8C;AAC9C,+BAA+B;AAC/B,2DAAuD;AAGvD,+CAAwD;AAYxD,sBAAsB;AACtB;;;;;;;;;;;GAWG;AACI,KAAK,UAAU,kBAAkB,CACpC,MAAiC,EACjC,OAAiB;IAEjB,IAAA,oBAAQ,EAAC,MAAM,EAAE,gBAAgB,CAAC,CAAA;IAClC,IAAA,oBAAQ,EAAC,MAAM,CAAC,GAAG,EAAE,iBAAiB,CAAC,CAAA;IACvC,IAAA,oBAAQ,EAAC,MAAM,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAA;IAC/C,IAAA,oBAAQ,EAAC,OAAO,EAAE,qBAAqB,CAAC,CAAA;IAExC,yCAAyC;IACzC,MAAM,YAAY,GAAiB,SAAS,CAAC,YAAY,CAAA;IACzD,YAAY,CAAC,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAA;IACvC,YAAY,CAAC,GAAG,CAAC,GAAG,GAAG,MAAM,CAAC,GAAG,CAAA;IAEjC,YAAY,CAAC,GAAG,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,IAAI,EAAE,CAAA;IACrD,YAAY,CAAC,GAAG,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,IAAI,IAAI,CAAA;IACjD,YAAY,CAAC,GAAG,CAAC,eAAe,GAAG,MAAM,CAAC,eAAe,IAAI,CAAC,CAAA;IAE9D,uCAAuC;IACvC,YAAY,CAAC,YAAY,GAAG,IAAI,GAAG,EAAE,CAAA;IACrC,YAAY,CAAC,IAAI,GAAG,EAAE,CAAA;IACtB,YAAY,CAAC,SAAS,GAAG,EAAE,CAAA;IAC3B,YAAY,CAAC,MAAM,GAAG,EAAE,CAAA;IAExB,OAAO,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAA;IAC1C,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAA;IACzB,wDAAwD;IACxD,0BAA0B;IAC1B,IAAI,OAAO,GAAgB,qCAAiB,CAAC,KAAK,EAAE,CAAA;IACpD,gDAAgD;IAChD,OAAO,CAAC,OAAO,CAAC,IAAI,GAAG,OAAO,CAAC,SAAuB,CAAA;IACtD,OAAO,CAAC,OAAO,CAAC,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,CAAA;IACzC,4BAA4B;IAC5B,OAAO,CAAC,OAAO,CAAC,IAAI,GAAG,aAAa,CAAA;IACpC,OAAO,CAAC,OAAO,CAAC,IAAI,GAAG,CAAC,aAAa,EAAE,YAAY,CAAC,CAAA;IACpD,wBAAwB;IACxB,OAAO,CAAC,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;IACtC,0BAA0B;IAC1B,OAAO,GAAG,MAAM,qCAAiB,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;IACxD,4BAA4B;IAC5B,OAAO,OAAO,CAAA;AAClB,CAAC"}

package/build/websdk/XMTransactions.d.ts

@@ -1,4 +1,5 @@
 import type { Transaction, XMScript } from "../types";
+import { IKeyPair } from "./types/KeyPair";
 declare const XMTransactions: {
     schemas: {
         base_operation: {
@@ -65,5 +66,5 @@ declare const XMTransactions: {
         get_ordered_index: () => (string | number)[];
     };
 };
-declare function prepareXMPayload(xm_payload: XMScript): Promise<Transaction>;
+declare function prepareXMPayload(xm_payload: XMScript, keypair: IKeyPair): Promise<Transaction>;
 export { XMTransactions, prepareXMPayload };

package/build/websdk/XMTransactions.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.XMTransactions = void 0;
 exports.prepareXMPayload = prepareXMPayload;
 const DemosTransactions_1 = require("./DemosTransactions");
-const DemosWebAuth_1 = require("./DemosWebAuth");
 // INFO Using the methods below to create, manage and send chainscript-like scripts
 const XMTransactions = {
     schemas: {
@@ -113,10 +112,10 @@ const XMTransactions = {
     }
 };
 exports.XMTransactions = XMTransactions;
-async function prepareXMPayload(xm_payload) {
+async function prepareXMPayload(xm_payload, keypair) {
     var xm_transaction = DemosTransactions_1.DemosTransactions.empty();
     // From and To are the same in XM transactions
-    xm_transaction.content.from = DemosWebAuth_1.DemosWebAuth.getInstance().keypair.publicKey;
+    xm_transaction.content.from = keypair.publicKey;
     xm_transaction.content.to = xm_transaction.content.from;
     // Setting the type and data
     xm_transaction.content.type = "crosschainOperation";
@@ -124,8 +123,6 @@ async function prepareXMPayload(xm_payload) {
     // Producing a timestamp
     xm_transaction.content.timestamp = Date.now();
     // Signing the transaction
-    xm_transaction = await DemosTransactions_1.DemosTransactions.sign(xm_transaction);
-    // Returning the transaction
-    return xm_transaction;
+    return await DemosTransactions_1.DemosTransactions.sign(xm_transaction, keypair);
 }
 //# sourceMappingURL=XMTransactions.js.map

package/build/websdk/XMTransactions.js.map

@@ -1 +1 @@
-{"version":3,"file":"XMTransactions.js","sourceRoot":"","sources":["../../../src/websdk/XMTransactions.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"XMTransactions.js","sourceRoot":"","sources":["../../../src/websdk/XMTransactions.ts"],"names":[],"mappings":"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"}

package/build/websdk/demos.d.ts

@@ -1,26 +1,23 @@
-import { Socket } from 'socket.io-client';
-import * as skeletons from './utils/skeletons';
-import { DemosWebAuth } from './DemosWebAuth';
-import { prepareXMPayload } from './XMTransactions';
-import { prepareWeb2Payload } from './Web2Transactions';
-import type { EncryptedTransaction, Transaction, ValidityData } from '../types';
+import { Buffer } from "buffer/";
+import * as skeletons from "./utils/skeletons";
+import { DemosWebAuth } from "./DemosWebAuth";
+import { IPrepareWeb2PayloadParams } from "./Web2Transactions";
+import type { EncryptedTransaction, Transaction, ValidityData, XMScript } from "../types";
+import { IKeyPair } from "./types/KeyPair";
 export declare const demos: {
-    socket: Socket | null;
-    socket_connected: boolean;
-    connectedListener: (val: any) => void;
+    rpc_url: string | null;
     connected: boolean;
-    onConnectedChange: (listener: any) => void;
-    identity: any;
-    registry: {
-        [key: string]: any;
-    };
-    replies: {
-        waitReply: (muid: string) => void;
-        needReply: (muid: string | number) => boolean;
-        getReply: (muid: string | number) => any;
-        checkReply: (muid: any, ms?: number) => Promise<any>;
-    };
-    connect: (rpc_url: string) => void;
+    readonly walletConnected: boolean;
+    keypair: IKeyPair;
+    connect: (rpc_url: string) => Promise<boolean>;
+    connectWallet: (privateKey: string | Buffer | Uint8Array, options?: {
+        /**
+         * Whether the private key is a seed.
+         * If true, the seed will be converted to an ed25519 keypair.
+         */
+        isSeed?: boolean;
+    }) => Promise<string>;
+    getAddress: () => string;
     disconnect: () => void;
     generateMuid: () => string;
     nodeCall: (message: any, args?: {}) => Promise<any>;
@@ -31,33 +28,48 @@ export declare const demos: {
         retrieveAll: (L2PSId: string, blockNumber: number) => Promise<EncryptedTransaction[]>;
         register: (eTx: EncryptedTransaction) => Promise<any>;
     };
-    call: (type: any, message: any, data?: any, extra?: any, sender?: any, receiver?: any) => Promise<any>;
+    call: (method: any, message: any, data?: any, extra?: any, sender?: any, receiver?: any) => Promise<any>;
     getLastBlockNumber: () => Promise<any>;
     getLastBlockHash: () => Promise<any>;
     getBlockByNumber: (blockNumber: any) => Promise<any>;
     getBlockByHash: (blockHash: any) => Promise<any>;
     getTxByHash: (txHash?: string) => Promise<any>;
+    getAllTxs: () => Promise<any>;
     getPeerlist: () => Promise<any>;
     getMempool: () => Promise<any>;
     getPeerIdentity: () => Promise<any>;
     getAddressInfo: (address: any) => Promise<any>;
     web2: {
-        createPayload: typeof prepareWeb2Payload;
+        createPayload: (params: IPrepareWeb2PayloadParams, keypair?: IKeyPair) => Promise<Transaction>;
     };
     xm: {
-        createPayload: typeof prepareXMPayload;
+        createPayload: (xm_payload: XMScript, keypair?: IKeyPair) => Promise<Transaction>;
+    };
+    tx: {
+        /**
+         * Signs a transaction after hashing its content.
+         *
+         * @param raw_tx - The transaction to be signed.
+         * @param keypair - The keypair to use for signing. If not provided, the keypair connected to the wallet will be used.
+         * @returns A Promise that resolves to the signed transaction.
+         */
+        sign: (raw_tx: Transaction, keypair?: IKeyPair) => Promise<Transaction>;
+        empty: () => Transaction;
+        prepare: (data?: any) => Promise<Transaction>;
+        confirm: (signedPayload: Transaction) => Promise<any>;
+        broadcast: (validityData: ValidityData) => Promise<any>;
     };
     DemosTransactions: {
         empty: () => Transaction;
         prepare: (data?: any) => Promise<Transaction>;
-        sign: (raw_tx: Transaction, private_key?: Uint8Array | null) => Promise<Transaction>;
+        sign: (raw_tx: Transaction, keypair: IKeyPair) => Promise<Transaction>;
         confirm: (signedPayload: Transaction) => Promise<any>;
         broadcast: (validityData: ValidityData) => Promise<any>;
     };
     transactions: {
         empty: () => Transaction;
         prepare: (data?: any) => Promise<Transaction>;
-        sign: (raw_tx: Transaction, private_key?: Uint8Array | null) => Promise<Transaction>;
+        sign: (raw_tx: Transaction, keypair: IKeyPair) => Promise<Transaction>;
         confirm: (signedPayload: Transaction) => Promise<any>;
         broadcast: (validityData: ValidityData) => Promise<any>;
     };