phantasma-sdk-ts 0.5.2 → 0.7.0

package/dist/cjs/core/link/easyConnect.js

@@ -13,8 +13,7 @@ class EasyConnect {
         this.link = new phantasmaLink_js_1.PhantasmaLink('easyConnect', false);
         this.connected = false;
         this.requiredVersion = 4;
-        //Make This Auto In Future
-        this.nexus = easyScript_js_1.Nexus.Mainnet;
+        this.nexus = null;
         if (_options == null) {
             this.setConfig('auto');
         }
@@ -59,6 +58,12 @@ class EasyConnect {
             //Console Logging for Debugging Purposes
             if (data) {
                 that.connected = true;
+                that.nexus =
+                    that.link.nexus === easyScript_js_1.Nexus.Mainnet ||
+                        that.link.nexus === easyScript_js_1.Nexus.Simnet ||
+                        that.link.nexus === easyScript_js_1.Nexus.Testnet
+                        ? that.link.nexus
+                        : null;
                 onSuccess(data);
                 logger_js_1.logger.log('%c[EasyConnect Connected]', 'color:green');
                 logger_js_1.logger.log("Wallet Address '" + that.link.account.address + "' connected via " + that.link.wallet);
@@ -72,6 +77,7 @@ class EasyConnect {
     disconnect(_message = 'Graceful Disconect') {
         this.link.disconnect(_message);
         this.connected = false;
+        this.nexus = null;
     }
     async query(_type = null, _arguments = null, _callback = (data) => {
         logger_js_1.logger.log(data);
@@ -160,6 +166,18 @@ class EasyConnect {
             onFail(message);
         }
     }
+    signPrebuiltTransaction(tx, onSuccess = (data) => { }, onFail = (data) => {
+        logger_js_1.logger.log('%cError: ' + data, 'color:red');
+    }) {
+        if (this.connected == true) {
+            this.link.signPrebuiltTransaction(tx, onSuccess, onFail);
+        }
+        else {
+            const message = 'Wallet is not connected';
+            logger_js_1.logger.log('%c' + message, 'color:red');
+            onFail(message);
+        }
+    }
     invokeScript(script, _callback) {
         this.link.invokeScript(script, _callback);
     }

package/dist/cjs/core/link/phantasmaLink.js

@@ -1,15 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PhantasmaLink = void 0;
+const Transaction_js_1 = require("../tx/Transaction.js");
 const index_js_1 = require("../vm/index.js");
 const ProofOfWork_js_1 = require("./interfaces/ProofOfWork.js");
 const CarbonBlob_js_1 = require("../types/Carbon/CarbonBlob.js");
 const Hex_js_1 = require("../utils/Hex.js");
+const index_js_2 = require("../types/index.js");
 const logger_js_1 = require("../utils/logger.js");
 class PhantasmaLink {
     //Construct The Link
     constructor(dappID, logging = true) {
         this.lastSocketErrorMessage = null;
+        this.socketTransport = null;
+        this.socketOpen = false;
         this.requestID = 0;
         //Message Logging
         this.onMessage = (msg) => {
@@ -18,7 +22,7 @@ class PhantasmaLink {
             }
         };
         this.version = 4;
-        this.nexus = 'testnet';
+        this.nexus = '';
         this.chain = 'main';
         this.platform = 'poltergeist';
         //Turn On|Off Console Logging
@@ -36,6 +40,19 @@ class PhantasmaLink {
         this.onLogin = function (succ) { }; //Does Nothing for Now
         this.onError = function (message) { }; //Does Nothing for Now
     }
+    // Preserve wallet-side failure details whenever the transport provides them.
+    describeFailure(result, fallback) {
+        if (typeof result === 'string' && result.length > 0) {
+            return result;
+        }
+        if (result && typeof result.error === 'string' && result.error.length > 0) {
+            return result.error;
+        }
+        if (result && typeof result.message === 'string' && result.message.length > 0) {
+            return result.message;
+        }
+        return fallback;
+    }
     //Connect To Wallet
     login(onLoginCallback, onErrorCallback, version = 4, platform = 'phantasma', providerHint = 'poltergeist') {
         this.providerHint = providerHint;
@@ -189,19 +206,26 @@ class PhantasmaLink {
     signTxSignature(tx, callback, onErrorCallback, signature = 'Ed25519') {
         if (!this.socket) {
             this.onMessage('not logged in');
+            if (onErrorCallback) {
+                onErrorCallback('Wallet is not connected');
+            }
             return;
         }
         if (tx == null) {
             this.onMessage('invalid data, sorry :(');
+            if (onErrorCallback) {
+                onErrorCallback('Invalid transaction data');
+            }
             return;
         }
-        if (tx.length >= 1024) {
+        if (tx.length >= 65536) {
             this.onMessage('data too big, sorry :(');
             if (onErrorCallback) {
-                onErrorCallback();
+                onErrorCallback('Transaction data is too big');
             }
             return;
         }
+        this.onError = onErrorCallback;
         let signDataStr = 'signTxSignature/' + tx + '/' + signature + '/' + this.platform;
         var that = this; //Allows the use of 'this' inside sendLinkRequest Object
         this.sendLinkRequest(signDataStr, function (result) {
@@ -213,11 +237,78 @@ class PhantasmaLink {
             }
             else {
                 if (onErrorCallback) {
-                    onErrorCallback();
+                    onErrorCallback(that.describeFailure(result, 'Wallet rejected transaction signature'));
                 }
             }
         });
     }
+    decodeWalletSignatureBytes(signatureHex, signature) {
+        if (signature !== 'Ed25519') {
+            throw new Error(`Unsupported transaction signature type: ${signature}`);
+        }
+        const reader = new index_js_2.PBinaryReader((0, Hex_js_1.hexToBytes)(signatureHex));
+        const rawSignatureHex = reader.readByteArray();
+        if (typeof rawSignatureHex !== 'string' || rawSignatureHex.length === 0) {
+            throw new Error('Wallet returned an empty transaction signature');
+        }
+        return (0, Hex_js_1.hexToBytes)(rawSignatureHex);
+    }
+    signPrebuiltTransaction(tx, callback, onErrorCallback, signature = 'Ed25519') {
+        if (!tx) {
+            const message = 'Error: Invalid transaction';
+            this.onMessage(message);
+            if (onErrorCallback) {
+                onErrorCallback(message);
+            }
+            return;
+        }
+        let unsignedTxHex;
+        try {
+            unsignedTxHex = tx.ToStringEncoded(false).toUpperCase();
+        }
+        catch (err) {
+            const message = 'Error: Unable to encode unsigned transaction';
+            this.onMessage(message + (err?.message ? ` (${err.message})` : ''));
+            if (onErrorCallback) {
+                onErrorCallback(message);
+            }
+            return;
+        }
+        this.signTxSignature(unsignedTxHex, (result) => {
+            if (!result?.success || typeof result.signature !== 'string' || result.signature.length === 0) {
+                const failure = this.describeFailure(result, 'Wallet rejected transaction signature');
+                if (onErrorCallback) {
+                    onErrorCallback(failure);
+                }
+                return;
+            }
+            try {
+                const signedTx = Transaction_js_1.Transaction.FromBytes(unsignedTxHex);
+                signedTx.signatures = [
+                    new index_js_2.Ed25519Signature(this.decodeWalletSignatureBytes(result.signature, signature)),
+                ];
+                if (this.account?.address && !signedTx.VerifySignature(this.account.address)) {
+                    throw new Error('Wallet returned a signature that does not match the connected account');
+                }
+                callback({
+                    success: true,
+                    signature: result.signature,
+                    signedTx: signedTx.ToStringEncoded(true).toUpperCase(),
+                });
+            }
+            catch (err) {
+                const message = err?.message || 'Unable to assemble signed transaction';
+                if (onErrorCallback) {
+                    onErrorCallback(message);
+                }
+            }
+        }, (message) => {
+            const failure = message || this.lastSocketErrorMessage || 'Wallet rejected transaction signature';
+            if (onErrorCallback) {
+                onErrorCallback(failure);
+            }
+        }, signature);
+    }
     multiSig(subject, callback, onErrorCallback, signature = 'Ed25519') {
         if (!this.socket) {
             this.onMessage('not logged in');
@@ -292,6 +383,9 @@ class PhantasmaLink {
         //Sends Signiture Request To Connected Wallet For Script
         this.sendLinkRequest('getNexus/', function (result) {
             if (result.success) {
+                if (typeof result.nexus === 'string') {
+                    that.nexus = result.nexus;
+                }
                 that.onMessage('Nexus Query,: ' + result);
                 if (callback) {
                     callback(result);
@@ -363,22 +457,31 @@ class PhantasmaLink {
         if (this.socket) {
             this.socket.close();
         }
+        const useInjectedSocket = 
+        // @ts-ignore
+        !!window.PhantasmaLinkSocket && this.providerHint !== 'poltergeist';
+        this.socketTransport = useInjectedSocket ? 'injected' : 'websocket';
+        this.socketOpen = false;
+        this.onMessage(useInjectedSocket
+            ? 'Using injected PhantasmaLinkSocket transport'
+            : `Using raw WebSocket transport: ${path}`);
         //@ts-ignore
-        this.socket = //@ts-ignore
-            window.PhantasmaLinkSocket && this.providerHint !== 'poltergeist'
-                ? // @ts-ignore
-                    new PhantasmaLinkSocket()
-                : new WebSocket(path);
+        this.socket = useInjectedSocket
+            ? // @ts-ignore
+                new PhantasmaLinkSocket()
+            : new WebSocket(path);
         this.requestCallback = null;
         this.lastSocketErrorMessage = null;
         this.token = null;
         this.account = null;
+        this.nexus = '';
         this.requestID = 0;
         let authorizeRequest = 'authorize/' + this.dapp + '/' + this.version;
         let getAccountRequest = 'getAccount/' + this.platform;
         let that = this;
         //Once Socket Opened
         this.socket.onopen = function (e) {
+            that.socketOpen = true;
             that.onMessage('Connection established, authorizing dapp in wallet...');
             if (isResume) {
                 that.fetchWallet(undefined, undefined);
@@ -389,6 +492,7 @@ class PhantasmaLink {
                     if (result.success) {
                         that.token = result.token;
                         that.wallet = result.wallet;
+                        that.nexus = typeof result.nexus === 'string' ? result.nexus : '';
                         that.onMessage('Authorized, obtaining account info...');
                         that.sendLinkRequest(getAccountRequest, function (result) {
                             if (result.success) {
@@ -405,7 +509,7 @@ class PhantasmaLink {
                         });
                     }
                     else {
-                        that.onError('Authorization failed...');
+                        that.onError(that.describeFailure(result, 'Authorization failed...'));
                         that.disconnect('Auth Failure');
                     }
                 });
@@ -428,8 +532,9 @@ class PhantasmaLink {
                     that.onError('Could not obtain account info... Make sure you have an account currently logged in');
                     that.disconnect(true);
                     break;
-                case 'A previouus request is still pending' || 'A previous request is still pending':
-                    that.onError('You have a pending action in your wallet');
+                case 'A previouus request is still pending':
+                case 'A previous request is still pending':
+                    that.onError(that.describeFailure(obj, 'You have a pending action in your wallet'));
                     break;
                 case 'user rejected':
                     that.onError('Transaction cancelled by user in ' + that.wallet);
@@ -455,6 +560,7 @@ class PhantasmaLink {
         };
         //Cleanup After Socket Closes
         this.socket.onclose = function (event) {
+            that.socketOpen = false;
             const reason = event.reason && event.reason.length > 0
                 ? event.reason
                 : that.lastSocketErrorMessage || (event.wasClean ? 'Wallet connection closed' : 'Connection terminated unexpectedly');
@@ -505,8 +611,11 @@ class PhantasmaLink {
         this.requestCallback = callback;
         const socket = this.socket;
         const openState = typeof WebSocket !== 'undefined' && typeof WebSocket.OPEN === 'number' ? WebSocket.OPEN : 1;
-        const isSocketOpen = socket && socket.readyState === openState;
-        if (!socket || !isSocketOpen) {
+        const hasSend = socket && typeof socket.send === 'function';
+        const hasReadyState = socket && typeof socket.readyState === 'number';
+        const isSocketOpen = hasSend &&
+            (hasReadyState ? socket.readyState === openState : this.socketOpen);
+        if (!socket || !hasSend || !isSocketOpen) {
             this.handleSocketFailure('Wallet connection is closed. Please reconnect to your wallet.');
             return;
         }
@@ -540,6 +649,7 @@ class PhantasmaLink {
     //Disconnect The Wallet Connection Socket
     disconnect(triggered) {
         this.onMessage('Disconnecting Phantasma Link: ' + triggered);
+        this.socketOpen = false;
         if (this.socket)
             this.socket.close();
     }

package/dist/esm/core/link/easyConnect.js

@@ -10,8 +10,7 @@ export class EasyConnect {
         this.link = new PhantasmaLink('easyConnect', false);
         this.connected = false;
         this.requiredVersion = 4;
-        //Make This Auto In Future
-        this.nexus = Nexus.Mainnet;
+        this.nexus = null;
         if (_options == null) {
             this.setConfig('auto');
         }
@@ -56,6 +55,12 @@ export class EasyConnect {
             //Console Logging for Debugging Purposes
             if (data) {
                 that.connected = true;
+                that.nexus =
+                    that.link.nexus === Nexus.Mainnet ||
+                        that.link.nexus === Nexus.Simnet ||
+                        that.link.nexus === Nexus.Testnet
+                        ? that.link.nexus
+                        : null;
                 onSuccess(data);
                 logger.log('%c[EasyConnect Connected]', 'color:green');
                 logger.log("Wallet Address '" + that.link.account.address + "' connected via " + that.link.wallet);
@@ -69,6 +74,7 @@ export class EasyConnect {
     disconnect(_message = 'Graceful Disconect') {
         this.link.disconnect(_message);
         this.connected = false;
+        this.nexus = null;
     }
     async query(_type = null, _arguments = null, _callback = (data) => {
         logger.log(data);
@@ -157,6 +163,18 @@ export class EasyConnect {
             onFail(message);
         }
     }
+    signPrebuiltTransaction(tx, onSuccess = (data) => { }, onFail = (data) => {
+        logger.log('%cError: ' + data, 'color:red');
+    }) {
+        if (this.connected == true) {
+            this.link.signPrebuiltTransaction(tx, onSuccess, onFail);
+        }
+        else {
+            const message = 'Wallet is not connected';
+            logger.log('%c' + message, 'color:red');
+            onFail(message);
+        }
+    }
     invokeScript(script, _callback) {
         this.link.invokeScript(script, _callback);
     }

package/dist/esm/core/link/phantasmaLink.js

@@ -1,12 +1,16 @@
+import { Transaction } from '../tx/Transaction.js';
 import { ScriptBuilder } from '../vm/index.js';
 import { ProofOfWork } from './interfaces/ProofOfWork.js';
 import { CarbonBlob } from '../types/Carbon/CarbonBlob.js';
-import { bytesToHex } from '../utils/Hex.js';
+import { bytesToHex, hexToBytes } from '../utils/Hex.js';
+import { Ed25519Signature, PBinaryReader } from '../types/index.js';
 import { logger } from '../utils/logger.js';
 export class PhantasmaLink {
     //Construct The Link
     constructor(dappID, logging = true) {
         this.lastSocketErrorMessage = null;
+        this.socketTransport = null;
+        this.socketOpen = false;
         this.requestID = 0;
         //Message Logging
         this.onMessage = (msg) => {
@@ -15,7 +19,7 @@ export class PhantasmaLink {
             }
         };
         this.version = 4;
-        this.nexus = 'testnet';
+        this.nexus = '';
         this.chain = 'main';
         this.platform = 'poltergeist';
         //Turn On|Off Console Logging
@@ -33,6 +37,19 @@ export class PhantasmaLink {
         this.onLogin = function (succ) { }; //Does Nothing for Now
         this.onError = function (message) { }; //Does Nothing for Now
     }
+    // Preserve wallet-side failure details whenever the transport provides them.
+    describeFailure(result, fallback) {
+        if (typeof result === 'string' && result.length > 0) {
+            return result;
+        }
+        if (result && typeof result.error === 'string' && result.error.length > 0) {
+            return result.error;
+        }
+        if (result && typeof result.message === 'string' && result.message.length > 0) {
+            return result.message;
+        }
+        return fallback;
+    }
     //Connect To Wallet
     login(onLoginCallback, onErrorCallback, version = 4, platform = 'phantasma', providerHint = 'poltergeist') {
         this.providerHint = providerHint;
@@ -186,19 +203,26 @@ export class PhantasmaLink {
     signTxSignature(tx, callback, onErrorCallback, signature = 'Ed25519') {
         if (!this.socket) {
             this.onMessage('not logged in');
+            if (onErrorCallback) {
+                onErrorCallback('Wallet is not connected');
+            }
             return;
         }
         if (tx == null) {
             this.onMessage('invalid data, sorry :(');
+            if (onErrorCallback) {
+                onErrorCallback('Invalid transaction data');
+            }
             return;
         }
-        if (tx.length >= 1024) {
+        if (tx.length >= 65536) {
             this.onMessage('data too big, sorry :(');
             if (onErrorCallback) {
-                onErrorCallback();
+                onErrorCallback('Transaction data is too big');
             }
             return;
         }
+        this.onError = onErrorCallback;
         let signDataStr = 'signTxSignature/' + tx + '/' + signature + '/' + this.platform;
         var that = this; //Allows the use of 'this' inside sendLinkRequest Object
         this.sendLinkRequest(signDataStr, function (result) {
@@ -210,11 +234,78 @@ export class PhantasmaLink {
             }
             else {
                 if (onErrorCallback) {
-                    onErrorCallback();
+                    onErrorCallback(that.describeFailure(result, 'Wallet rejected transaction signature'));
                 }
             }
         });
     }
+    decodeWalletSignatureBytes(signatureHex, signature) {
+        if (signature !== 'Ed25519') {
+            throw new Error(`Unsupported transaction signature type: ${signature}`);
+        }
+        const reader = new PBinaryReader(hexToBytes(signatureHex));
+        const rawSignatureHex = reader.readByteArray();
+        if (typeof rawSignatureHex !== 'string' || rawSignatureHex.length === 0) {
+            throw new Error('Wallet returned an empty transaction signature');
+        }
+        return hexToBytes(rawSignatureHex);
+    }
+    signPrebuiltTransaction(tx, callback, onErrorCallback, signature = 'Ed25519') {
+        if (!tx) {
+            const message = 'Error: Invalid transaction';
+            this.onMessage(message);
+            if (onErrorCallback) {
+                onErrorCallback(message);
+            }
+            return;
+        }
+        let unsignedTxHex;
+        try {
+            unsignedTxHex = tx.ToStringEncoded(false).toUpperCase();
+        }
+        catch (err) {
+            const message = 'Error: Unable to encode unsigned transaction';
+            this.onMessage(message + (err?.message ? ` (${err.message})` : ''));
+            if (onErrorCallback) {
+                onErrorCallback(message);
+            }
+            return;
+        }
+        this.signTxSignature(unsignedTxHex, (result) => {
+            if (!result?.success || typeof result.signature !== 'string' || result.signature.length === 0) {
+                const failure = this.describeFailure(result, 'Wallet rejected transaction signature');
+                if (onErrorCallback) {
+                    onErrorCallback(failure);
+                }
+                return;
+            }
+            try {
+                const signedTx = Transaction.FromBytes(unsignedTxHex);
+                signedTx.signatures = [
+                    new Ed25519Signature(this.decodeWalletSignatureBytes(result.signature, signature)),
+                ];
+                if (this.account?.address && !signedTx.VerifySignature(this.account.address)) {
+                    throw new Error('Wallet returned a signature that does not match the connected account');
+                }
+                callback({
+                    success: true,
+                    signature: result.signature,
+                    signedTx: signedTx.ToStringEncoded(true).toUpperCase(),
+                });
+            }
+            catch (err) {
+                const message = err?.message || 'Unable to assemble signed transaction';
+                if (onErrorCallback) {
+                    onErrorCallback(message);
+                }
+            }
+        }, (message) => {
+            const failure = message || this.lastSocketErrorMessage || 'Wallet rejected transaction signature';
+            if (onErrorCallback) {
+                onErrorCallback(failure);
+            }
+        }, signature);
+    }
     multiSig(subject, callback, onErrorCallback, signature = 'Ed25519') {
         if (!this.socket) {
             this.onMessage('not logged in');
@@ -289,6 +380,9 @@ export class PhantasmaLink {
         //Sends Signiture Request To Connected Wallet For Script
         this.sendLinkRequest('getNexus/', function (result) {
             if (result.success) {
+                if (typeof result.nexus === 'string') {
+                    that.nexus = result.nexus;
+                }
                 that.onMessage('Nexus Query,: ' + result);
                 if (callback) {
                     callback(result);
@@ -360,22 +454,31 @@ export class PhantasmaLink {
         if (this.socket) {
             this.socket.close();
         }
+        const useInjectedSocket = 
+        // @ts-ignore
+        !!window.PhantasmaLinkSocket && this.providerHint !== 'poltergeist';
+        this.socketTransport = useInjectedSocket ? 'injected' : 'websocket';
+        this.socketOpen = false;
+        this.onMessage(useInjectedSocket
+            ? 'Using injected PhantasmaLinkSocket transport'
+            : `Using raw WebSocket transport: ${path}`);
         //@ts-ignore
-        this.socket = //@ts-ignore
-            window.PhantasmaLinkSocket && this.providerHint !== 'poltergeist'
-                ? // @ts-ignore
-                    new PhantasmaLinkSocket()
-                : new WebSocket(path);
+        this.socket = useInjectedSocket
+            ? // @ts-ignore
+                new PhantasmaLinkSocket()
+            : new WebSocket(path);
         this.requestCallback = null;
         this.lastSocketErrorMessage = null;
         this.token = null;
         this.account = null;
+        this.nexus = '';
         this.requestID = 0;
         let authorizeRequest = 'authorize/' + this.dapp + '/' + this.version;
         let getAccountRequest = 'getAccount/' + this.platform;
         let that = this;
         //Once Socket Opened
         this.socket.onopen = function (e) {
+            that.socketOpen = true;
             that.onMessage('Connection established, authorizing dapp in wallet...');
             if (isResume) {
                 that.fetchWallet(undefined, undefined);
@@ -386,6 +489,7 @@ export class PhantasmaLink {
                     if (result.success) {
                         that.token = result.token;
                         that.wallet = result.wallet;
+                        that.nexus = typeof result.nexus === 'string' ? result.nexus : '';
                         that.onMessage('Authorized, obtaining account info...');
                         that.sendLinkRequest(getAccountRequest, function (result) {
                             if (result.success) {
@@ -402,7 +506,7 @@ export class PhantasmaLink {
                         });
                     }
                     else {
-                        that.onError('Authorization failed...');
+                        that.onError(that.describeFailure(result, 'Authorization failed...'));
                         that.disconnect('Auth Failure');
                     }
                 });
@@ -425,8 +529,9 @@ export class PhantasmaLink {
                     that.onError('Could not obtain account info... Make sure you have an account currently logged in');
                     that.disconnect(true);
                     break;
-                case 'A previouus request is still pending' || 'A previous request is still pending':
-                    that.onError('You have a pending action in your wallet');
+                case 'A previouus request is still pending':
+                case 'A previous request is still pending':
+                    that.onError(that.describeFailure(obj, 'You have a pending action in your wallet'));
                     break;
                 case 'user rejected':
                     that.onError('Transaction cancelled by user in ' + that.wallet);
@@ -452,6 +557,7 @@ export class PhantasmaLink {
         };
         //Cleanup After Socket Closes
         this.socket.onclose = function (event) {
+            that.socketOpen = false;
             const reason = event.reason && event.reason.length > 0
                 ? event.reason
                 : that.lastSocketErrorMessage || (event.wasClean ? 'Wallet connection closed' : 'Connection terminated unexpectedly');
@@ -502,8 +608,11 @@ export class PhantasmaLink {
         this.requestCallback = callback;
         const socket = this.socket;
         const openState = typeof WebSocket !== 'undefined' && typeof WebSocket.OPEN === 'number' ? WebSocket.OPEN : 1;
-        const isSocketOpen = socket && socket.readyState === openState;
-        if (!socket || !isSocketOpen) {
+        const hasSend = socket && typeof socket.send === 'function';
+        const hasReadyState = socket && typeof socket.readyState === 'number';
+        const isSocketOpen = hasSend &&
+            (hasReadyState ? socket.readyState === openState : this.socketOpen);
+        if (!socket || !hasSend || !isSocketOpen) {
             this.handleSocketFailure('Wallet connection is closed. Please reconnect to your wallet.');
             return;
         }
@@ -537,6 +646,7 @@ export class PhantasmaLink {
     //Disconnect The Wallet Connection Socket
     disconnect(triggered) {
         this.onMessage('Disconnecting Phantasma Link: ' + triggered);
+        this.socketOpen = false;
         if (this.socket)
             this.socket.close();
     }

package/dist/types/core/link/easyConnect.d.ts

@@ -2,6 +2,7 @@ import { PhantasmaLink } from './phantasmaLink.js';
 import { ProofOfWork } from './interfaces/ProofOfWork.js';
 import { EasyScript, Nexus } from './easyScript.js';
 import { TxMsg } from '../types/Carbon/Blockchain/index.js';
+import { Transaction } from '../tx/Transaction.js';
 export declare class EasyConnect {
     requiredVersion: number;
     platform: string;
@@ -9,7 +10,7 @@ export declare class EasyConnect {
     link: PhantasmaLink;
     connected: boolean;
     script: EasyScript;
-    nexus: Nexus;
+    nexus: Nexus | null;
     constructor(_options?: Array<string>);
     setConfig(_provider: string): void;
     connect(onSuccess?: any, onFail?: any): void;
@@ -19,6 +20,7 @@ export declare class EasyConnect {
     signTransaction(script: string, payload?: any, onSuccess?: any, onFail?: any): void;
     signData(data: any, onSuccess?: any, onFail?: any): void;
     signCarbonTransaction(txMsg: TxMsg, onSuccess?: any, onFail?: any): void;
+    signPrebuiltTransaction(tx: Transaction, onSuccess?: any, onFail?: any): void;
     invokeScript(script: string, _callback: any): void;
     deployContract(script: string, payload?: any, proofOfWork?: ProofOfWork, onSuccess?: any, onFail?: any): void;
 }

package/dist/types/core/link/easyConnect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"easyConnect.d.ts","sourceRoot":"","sources":["../../../../src/core/link/easyConnect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,KAAK,EAAE,MAAM,qCAAqC,CAAC;AAG5D,qBAAa,WAAW;IACtB,eAAe,EAAE,MAAM,CAAC;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,aAAa,CAAC;IACpB,SAAS,EAAE,OAAO,CAAC;IACnB,MAAM,EAAE,UAAU,CAAC;IACnB,KAAK,EAAE,KAAK,CAAC;gBAED,QAAQ,GAAE,KAAK,CAAC,MAAM,CAAQ;IAyB1C,SAAS,CAAC,SAAS,EAAE,MAAM;IAwB3B,OAAO,CACL,SAAS,GAAE,GAAkB,EAC7B,MAAM,GAAE,GAEP;IA0BH,UAAU,CAAC,QAAQ,GAAE,MAA6B;IAK5C,KAAK,CACT,KAAK,GAAE,MAAa,EACpB,UAAU,GAAE,KAAK,CAAC,MAAM,CAAQ,EAChC,SAAS,GAAE,GAEV;IA4CG,MAAM,CACV,KAAK,GAAE,MAAa,EACpB,UAAU,GAAE,KAAK,CAAC,GAAG,CAAQ,EAC7B,SAAS,GAAE,GAAkB,EAC7B,MAAM,GAAE,GAEP;IAyBH,eAAe,CACb,MAAM,EAAE,MAAM,EACd,OAAO,MAAO,EACd,SAAS,GAAE,GAAkB,EAC7B,MAAM,GAAE,GAEP;IAKH,QAAQ,CACN,IAAI,EAAE,GAAG,EACT,SAAS,GAAE,GAAkB,EAC7B,MAAM,GAAE,GAEP;IAKH,qBAAqB,CACnB,KAAK,EAAE,KAAK,EACZ,SAAS,GAAE,GAAkB,EAC7B,MAAM,GAAE,GAEP;IAWH,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG;IAI3C,cAAc,CACZ,MAAM,EAAE,MAAM,EACd,OAAO,MAAO,EACd,WAAW,GAAE,WAAiC,EAC9C,SAAS,GAAE,GAAkB,EAC7B,MAAM,GAAE,GAEP;CAIJ"}
+{"version":3,"file":"easyConnect.d.ts","sourceRoot":"","sources":["../../../../src/core/link/easyConnect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,KAAK,EAAE,MAAM,qCAAqC,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAGnD,qBAAa,WAAW;IACtB,eAAe,EAAE,MAAM,CAAC;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,aAAa,CAAC;IACpB,SAAS,EAAE,OAAO,CAAC;IACnB,MAAM,EAAE,UAAU,CAAC;IACnB,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC;gBAER,QAAQ,GAAE,KAAK,CAAC,MAAM,CAAQ;IAwB1C,SAAS,CAAC,SAAS,EAAE,MAAM;IAwB3B,OAAO,CACL,SAAS,GAAE,GAAkB,EAC7B,MAAM,GAAE,GAEP;IAgCH,UAAU,CAAC,QAAQ,GAAE,MAA6B;IAM5C,KAAK,CACT,KAAK,GAAE,MAAa,EACpB,UAAU,GAAE,KAAK,CAAC,MAAM,CAAQ,EAChC,SAAS,GAAE,GAEV;IA4CG,MAAM,CACV,KAAK,GAAE,MAAa,EACpB,UAAU,GAAE,KAAK,CAAC,GAAG,CAAQ,EAC7B,SAAS,GAAE,GAAkB,EAC7B,MAAM,GAAE,GAEP;IAyBH,eAAe,CACb,MAAM,EAAE,MAAM,EACd,OAAO,MAAO,EACd,SAAS,GAAE,GAAkB,EAC7B,MAAM,GAAE,GAEP;IAKH,QAAQ,CACN,IAAI,EAAE,GAAG,EACT,SAAS,GAAE,GAAkB,EAC7B,MAAM,GAAE,GAEP;IAKH,qBAAqB,CACnB,KAAK,EAAE,KAAK,EACZ,SAAS,GAAE,GAAkB,EAC7B,MAAM,GAAE,GAEP;IAWH,uBAAuB,CACrB,EAAE,EAAE,WAAW,EACf,SAAS,GAAE,GAAkB,EAC7B,MAAM,GAAE,GAEP;IAWH,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG;IAI3C,cAAc,CACZ,MAAM,EAAE,MAAM,EACd,OAAO,MAAO,EACd,WAAW,GAAE,WAAiC,EAC9C,SAAS,GAAE,GAAkB,EAC7B,MAAM,GAAE,GAEP;CAIJ"}

package/dist/types/core/link/phantasmaLink.d.ts

@@ -1,6 +1,12 @@
+import { Transaction } from '../tx/Transaction.js';
 import { ProofOfWork } from './interfaces/ProofOfWork.js';
 import { IAccount } from './interfaces/IAccount.js';
 import { TxMsg } from '../types/Carbon/Blockchain/index.js';
+export interface PrebuiltTransactionSignResult {
+    success: true;
+    signature: string;
+    signedTx: string;
+}
 export declare class PhantasmaLink {
     host: string;
     dapp: any;
@@ -10,6 +16,8 @@ export declare class PhantasmaLink {
     socket: any;
     requestCallback: any;
     private lastSocketErrorMessage;
+    socketTransport: 'websocket' | 'injected' | null;
+    socketOpen: boolean;
     token: any;
     requestID: number;
     account: IAccount;
@@ -21,11 +29,14 @@ export declare class PhantasmaLink {
     platform: string;
     constructor(dappID: any, logging?: boolean);
     onMessage: (msg: string) => void;
+    private describeFailure;
     login(onLoginCallback: (success: boolean) => void, onErrorCallback: (message: string) => void, version?: number, platform?: string, providerHint?: string): void;
     invokeScript(script: string, callback: (message: string) => void): void;
     signTx(script: any, payload: string | null, callback: (arg0: string) => void, onErrorCallback: () => void, pow?: ProofOfWork, signature?: string): void;
     signCarbonTxAndBroadcast(txMsg: TxMsg, callback?: (result: any) => void, onErrorCallback?: (message?: string) => void): void;
-    signTxSignature(tx: string, callback: (result: string) => void, onErrorCallback: () => void, signature?: string): void;
+    signTxSignature(tx: string, callback: (result: string) => void, onErrorCallback: (message?: string) => void, signature?: string): void;
+    private decodeWalletSignatureBytes;
+    signPrebuiltTransaction(tx: Transaction, callback: (result: PrebuiltTransactionSignResult) => void, onErrorCallback: (message?: string) => void, signature?: string): void;
     multiSig(subject: string, callback: (result: string) => void, onErrorCallback: () => void, signature?: string): void;
     getPeer(callback: (result: string) => void, onErrorCallback: () => void): void;
     fetchWallet(callback: (result: any) => void, onErrorCallback: (message: any) => void): void;

package/dist/types/core/link/phantasmaLink.d.ts.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "phantasma-sdk-ts",
-  "version": "0.5.2",
+  "version": "0.7.0",
   "description": "Typescript SDK for interacting with the Phantasma Chain",
   "author": "Phantasma Team",
   "main": "dist/cjs/index.js",