@ercworldio/blockchain-shared 1.0.22 → 1.0.24

package/build/services/solana/escrow/services/TreasuryWithdrawalSignature.d.ts

@@ -50,6 +50,23 @@ export interface Ed25519Entry {
     signature: Uint8Array;
     message: Uint8Array;
 }
+/**
+ * Wraps `message` in the Solana off-chain message envelope (legacy version 0 header). MUST match
+ * the program's `offchain_envelope` byte for byte:
+ *
+ *   0xff "solana offchain" | version (0) | format | length (u16 LE) | message
+ *
+ * Ledger-backed wallets can't sign arbitrary bytes, so `signMessage` on them signs this envelope
+ * instead of the raw approval text. Format is 0 for printable ASCII only, otherwise 1.
+ */
+export declare function offchainEnvelope(message: Uint8Array): Buffer;
+/**
+ * Returns the bytes `signature` actually covers: the raw message (regular wallets) or its
+ * off-chain envelope (Ledger-backed wallets). The precompile verifies whatever bytes the Ed25519
+ * instruction carries, and the program accepts either form, so the entry must carry the one that
+ * verifies. Falls back to the raw message when neither does; the precompile then rejects it.
+ */
+export declare function resolveSignedMessage(publicKey: Uint8Array, signature: Uint8Array, message: Uint8Array): Uint8Array;
 /**
  * Builds a single Ed25519SigVerify instruction carrying `entries` self-contained signatures
  * (each entry's pubkey, signature and message live in this instruction's own data). This is the
@@ -61,5 +78,5 @@ export interface Ed25519Entry {
  * approve one withdrawal all sign the same ~194-byte payload, so without sharing, a 2-of-N
  * approval would spend an extra ~194 bytes and overflow Solana's 1232-byte transaction limit.
  */
-export declare function buildTreasuryEd25519Instruction(entries: Ed25519Entry[]): TransactionInstruction;
+export declare function buildTreasuryEd25519Instruction(input: Ed25519Entry[]): TransactionInstruction;
 //# sourceMappingURL=TreasuryWithdrawalSignature.d.ts.map

package/build/services/solana/escrow/services/TreasuryWithdrawalSignature.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TreasuryWithdrawalSignature.d.ts","sourceRoot":"","sources":["../../../../../src/services/solana/escrow/services/TreasuryWithdrawalSignature.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,SAAS,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAGpF;;;;;GAKG;AAEH,wEAAwE;AACxE,MAAM,WAAW,sBAAsB;IACnC,4EAA4E;IAC5E,MAAM,EAAE,MAAM,CAAC;IACf,qDAAqD;IACrD,SAAS,EAAE,MAAM,CAAC;CACrB;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,8BAA8B,CAAC,MAAM,EAAE;IACnD,eAAe,EAAE,SAAS,CAAC;IAC3B,SAAS,EAAE,SAAS,CAAC;IACrB,SAAS,EAAE,SAAS,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;CACrB,GAAG,MAAM,CAWT;AAED,oFAAoF;AACpF,wBAAgB,sBAAsB,CAAC,CAAC,EAAE,MAAM,GAAG,UAAU,CAU5D;AAED,4EAA4E;AAC5E,MAAM,WAAW,YAAY;IACzB,SAAS,EAAE,UAAU,CAAC;IACtB,SAAS,EAAE,UAAU,CAAC;IACtB,OAAO,EAAE,UAAU,CAAC;CACvB;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,+BAA+B,CAAC,OAAO,EAAE,YAAY,EAAE,GAAG,sBAAsB,CAoD/F"}
+{"version":3,"file":"TreasuryWithdrawalSignature.d.ts","sourceRoot":"","sources":["../../../../../src/services/solana/escrow/services/TreasuryWithdrawalSignature.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,SAAS,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAIpF;;;;;GAKG;AAEH,wEAAwE;AACxE,MAAM,WAAW,sBAAsB;IACnC,4EAA4E;IAC5E,MAAM,EAAE,MAAM,CAAC;IACf,qDAAqD;IACrD,SAAS,EAAE,MAAM,CAAC;CACrB;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,8BAA8B,CAAC,MAAM,EAAE;IACnD,eAAe,EAAE,SAAS,CAAC;IAC3B,SAAS,EAAE,SAAS,CAAC;IACrB,SAAS,EAAE,SAAS,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;CACrB,GAAG,MAAM,CAWT;AAED,oFAAoF;AACpF,wBAAgB,sBAAsB,CAAC,CAAC,EAAE,MAAM,GAAG,UAAU,CAU5D;AAED,4EAA4E;AAC5E,MAAM,WAAW,YAAY;IACzB,SAAS,EAAE,UAAU,CAAC;IACtB,SAAS,EAAE,UAAU,CAAC;IACtB,OAAO,EAAE,UAAU,CAAC;CACvB;AAID;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,UAAU,GAAG,MAAM,CAM5D;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,GAAG,UAAU,CAKlH;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,+BAA+B,CAAC,KAAK,EAAE,YAAY,EAAE,GAAG,sBAAsB,CAsD7F"}

package/build/services/solana/escrow/services/TreasuryWithdrawalSignature.js

@@ -5,9 +5,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildWithdrawalApprovalMessage = buildWithdrawalApprovalMessage;
 exports.decodeEd25519Signature = decodeEd25519Signature;
+exports.offchainEnvelope = offchainEnvelope;
+exports.resolveSignedMessage = resolveSignedMessage;
 exports.buildTreasuryEd25519Instruction = buildTreasuryEd25519Instruction;
 const web3_js_1 = require("@solana/web3.js");
 const bs58_1 = __importDefault(require("bs58"));
+const tweetnacl_1 = __importDefault(require("tweetnacl"));
 /**
  * Builds the UTF-8 approval message a treasury signer approves. MUST match the program's
  * `build_withdrawal_message` byte for byte, or verification fails.
@@ -57,6 +60,38 @@ function decodeEd25519Signature(s) {
     catch ( /* fallthrough */_a) { /* fallthrough */ }
     throw new Error("Invalid Ed25519 signature encoding (expected 64 bytes as base64/hex/base58)");
 }
+const OFFCHAIN_SIGNING_DOMAIN = Buffer.concat([Buffer.from([0xff]), Buffer.from("solana offchain", "ascii")]);
+/**
+ * Wraps `message` in the Solana off-chain message envelope (legacy version 0 header). MUST match
+ * the program's `offchain_envelope` byte for byte:
+ *
+ *   0xff "solana offchain" | version (0) | format | length (u16 LE) | message
+ *
+ * Ledger-backed wallets can't sign arbitrary bytes, so `signMessage` on them signs this envelope
+ * instead of the raw approval text. Format is 0 for printable ASCII only, otherwise 1.
+ */
+function offchainEnvelope(message) {
+    if (message.length > 0xffff)
+        throw new Error("Message too long for the off-chain message header");
+    const format = message.every(b => b >= 0x20 && b <= 0x7e) ? 0 : 1;
+    const len = Buffer.alloc(2);
+    len.writeUInt16LE(message.length);
+    return Buffer.concat([OFFCHAIN_SIGNING_DOMAIN, Buffer.from([0, format]), len, Buffer.from(message)]);
+}
+/**
+ * Returns the bytes `signature` actually covers: the raw message (regular wallets) or its
+ * off-chain envelope (Ledger-backed wallets). The precompile verifies whatever bytes the Ed25519
+ * instruction carries, and the program accepts either form, so the entry must carry the one that
+ * verifies. Falls back to the raw message when neither does; the precompile then rejects it.
+ */
+function resolveSignedMessage(publicKey, signature, message) {
+    if (tweetnacl_1.default.sign.detached.verify(message, signature, publicKey))
+        return message;
+    const envelope = offchainEnvelope(message);
+    if (tweetnacl_1.default.sign.detached.verify(envelope, signature, publicKey))
+        return envelope;
+    return message;
+}
 /**
  * Builds a single Ed25519SigVerify instruction carrying `entries` self-contained signatures
  * (each entry's pubkey, signature and message live in this instruction's own data). This is the
@@ -68,7 +103,9 @@ function decodeEd25519Signature(s) {
  * approve one withdrawal all sign the same ~194-byte payload, so without sharing, a 2-of-N
  * approval would spend an extra ~194 bytes and overflow Solana's 1232-byte transaction limit.
  */
-function buildTreasuryEd25519Instruction(entries) {
+function buildTreasuryEd25519Instruction(input) {
+    // Carry the bytes each signature actually covers (raw, or the Ledger off-chain envelope)
+    const entries = input.map(e => (Object.assign(Object.assign({}, e), { message: resolveSignedMessage(e.publicKey, e.signature, e.message) })));
     const N = entries.length;
     const OFFSETS_SIZE = 14;
     const ENTRY_SIZE = 32 + 64; // pubkey + signature

package/build/services/tron/services/TronHotWallet.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TronHotWallet.d.ts","sourceRoot":"","sources":["../../../../src/services/tron/services/TronHotWallet.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAElC,OAAO,EAAoB,UAAU,EAAE,eAAe,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEnH,cAAM,aAAa;IACf;;OAEG;WACU,UAAU,CAAC,YAAY,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;IAYhF;;OAEG;WACU,QAAQ,CAAC,YAAY,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;IAe1G;;OAEG;WACU,aAAa,CAAC,WAAW,EAAE,UAAU,EAAE,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC;QAAE,OAAO,EAAE,YAAY,EAAE,CAAC;QAAC,MAAM,EAAE,eAAe,EAAE,CAAA;KAAE,CAAC;WAsB3H,oBAAoB,CAAC,WAAW,EAAE,UAAU,EAAE,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC;QAAE,OAAO,EAAE,YAAY,EAAE,CAAC;QAAC,MAAM,EAAE,eAAe,EAAE,CAAA;KAAE,CAAC;IA+B/I,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,wBAAwB,CAe9C;IAEF,MAAM,CAAC,WAAW,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO;WAM9B,YAAY,CAAC,YAAY,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,cAAc,CAAC;WA0BzG,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO;CAelE;AAED,eAAe,aAAa,CAAC"}
+{"version":3,"file":"TronHotWallet.d.ts","sourceRoot":"","sources":["../../../../src/services/tron/services/TronHotWallet.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAElC,OAAO,EAAoB,UAAU,EAAE,eAAe,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEnH,cAAM,aAAa;IACf;;OAEG;WACU,UAAU,CAAC,YAAY,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;IAYhF;;OAEG;WACU,QAAQ,CAAC,YAAY,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;IAe1G;;OAEG;WACU,aAAa,CAAC,WAAW,EAAE,UAAU,EAAE,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC;QAAE,OAAO,EAAE,YAAY,EAAE,CAAC;QAAC,MAAM,EAAE,eAAe,EAAE,CAAA;KAAE,CAAC;WAsB3H,oBAAoB,CAAC,WAAW,EAAE,UAAU,EAAE,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC;QAAE,OAAO,EAAE,YAAY,EAAE,CAAC;QAAC,MAAM,EAAE,eAAe,EAAE,CAAA;KAAE,CAAC;IA+B/I,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,wBAAwB,CAe9C;IAEF,MAAM,CAAC,WAAW,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO;WAM9B,YAAY,CAAC,YAAY,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,cAAc,CAAC;WA4BzG,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO;CAelE;AAED,eAAe,aAAa,CAAC"}

package/build/services/tron/services/TronHotWallet.js

@@ -112,8 +112,10 @@ class TronHotWallet {
             try {
                 if (tokenAddress === ethers_1.ethers.ZeroAddress.slice(2) || tokenAddress === ethers_1.ethers.ZeroAddress || tokenAddress.toUpperCase() === "TRX") {
                     const tx = yield tronWeb.trx.sendTransaction(to, Number(amount));
-                    if (tx.result === false) {
-                        const code = tx.code || '';
+                    // A rejected broadcast usually comes back as { code, txid, message } with no `result`,
+                    // so anything other than result === true is a failure (the txid alone proves nothing)
+                    if (tx.result !== true) {
+                        const code = tx.code || 'BROADCAST_REJECTED';
                         const msg = tx.message
                             ? Buffer.from(tx.message, 'hex').toString('utf8')
                             : code;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ercworldio/blockchain-shared",
-  "version": "1.0.22",
+  "version": "1.0.24",
   "description": "Shared library for blockchain projects",
   "main": "build/index.js",
   "types": "build/index.d.ts",