@qorechain/connect 0.1.0 → 0.2.1

package/README.md

@@ -30,5 +30,28 @@ PQC tx committed **code 0** (ML-DSA accepted); SVM read OK.
   *before* the wallet `signDirect`s it, so the wallet needs zero changes.
 - **SVM** → reads native; `tx svm execute` is a cosmos tx → same PQC layer.
 
+## Hybrid sign-bytes form (v1 / v2, chain v3.2.0 / testnet v3.1.98)
+
+The ML-DSA-87 signature covers one of two byte forms and a network accepts exactly
+one at any height: v1 `BE32(len B0) ‖ B0 ‖ BE32(len A) ‖ A`, or v2, which prefixes
+`"qorechain-pqc-hybrid-v2" ‖ BE64(len chainId) ‖ chainId`. `qorechain-vladi`
+(mainnet) and `qorechain-diana` (testnet) verify v1 until the upgrade that carries
+the switch is applied on them and v2 afterwards; testnet is on v2, **mainnet stays
+on v1 until its own upgrade**. Other chains verify v2 from genesis. The switch
+ships under two plan names — mainnet applies `v3.2.0`, the testnet already applied
+`v3.1.98` — and the resolver asks for both, so either one applied means v2.
+
+```js
+await QoreConnect.sendCosmos(keplr, { address, pubkey, mlsk, acct, seq, to, amount,
+  chainId: 'qorechain-vladi', rpc, rest: lcdUrl /* or signBytesVersion: 'v1' | 'v2' */ });
+// -> { vm:'cosmos', code, hash, pqc:true, signBytesVersion: 'v1' | 'v2' }
+```
+
+`signBytesVersion: 'auto'` (default) asks `rest` (or `QORE_REST`) through
+`@qorechain/wallet-adapter`'s resolver and caches the answer for 60 s; on vladi /
+diana without `rest` it throws instead of guessing. With `'auto'`, a refusal with
+`pqc` code 21 re-resolves once and, if the answer changed, re-signs and broadcasts
+once more. Explicit `'v1'` / `'v2'` never retries.
+
 ## License
 Apache-2.0

package/package.json

@@ -1,12 +1,32 @@
 {
   "name": "@qorechain/connect",
-  "version": "0.1.0",
+  "version": "0.2.1",
   "description": "One universal wallet connector for QoreChain across all 3 VMs (EVM, Cosmos, SVM). Detects any wallet by its standard interface (EIP-1193, OfflineDirectSigner, Solana Wallet Standard) and auto-layers the FIPS-204 PQC signature only where the chain requires it.",
   "type": "module",
   "main": "src/index.js",
   "license": "Apache-2.0",
-  "files": ["src", "README.md"],
-  "publishConfig": { "access": "public" },
-  "repository": { "type": "git", "url": "https://github.com/qorechain/qorechain-connect.git" },
-  "peerDependencies": { "@qorechain/wallet-adapter": "^0.1.0", "ethers": "^6", "@cosmjs/proto-signing": "^0.32" }
+  "files": [
+    "src",
+    "README.md"
+  ],
+  "scripts": {
+    "test": "node --test"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/qorechain/qorechain-connect.git"
+  },
+  "peerDependencies": {
+    "@qorechain/wallet-adapter": "^0.2.1",
+    "ethers": "^6",
+    "@cosmjs/proto-signing": "^0.32"
+  },
+  "devDependencies": {
+    "@qorechain/wallet-adapter": "^0.2.1",
+    "@noble/post-quantum": "^0.6.1",
+    "cosmjs-types": "^0.9.0"
+  }
 }

package/src/index.js

@@ -4,8 +4,14 @@ import { TxBody, AuthInfo, TxRaw, SignerInfo, ModeInfo, Fee, SignDoc } from 'cos
 import { SignMode } from 'cosmjs-types/cosmos/tx/signing/v1beta1/signing.js';
 import { PubKey } from 'cosmjs-types/cosmos/crypto/secp256k1/keys.js';
 import { MsgSend } from 'cosmjs-types/cosmos/bank/v1beta1/tx.js';
-const CHAIN=process.env.QORE_CHAIN_ID||'qorechain-diana', RPC=process.env.QORE_RPC||'http://127.0.0.1:26657', SVMRPC=process.env.QORE_SVM_RPC||'http://127.0.0.1:8899';
-const frame=(b0,a)=>{const o=new Uint8Array(8+b0.length+a.length);const d=new DataView(o.buffer);d.setUint32(0,b0.length,false);o.set(b0,4);d.setUint32(4+b0.length,a.length,false);o.set(a,8+b0.length);return o;};
+import { hybridSignBytes, resolveSignBytesVersion, isHybridSignBytesRejection } from '@qorechain/wallet-adapter';
+const CHAIN=process.env.QORE_CHAIN_ID||'qorechain-diana', RPC=process.env.QORE_RPC||'http://127.0.0.1:26657', SVMRPC=process.env.QORE_SVM_RPC||'http://127.0.0.1:8899', REST=process.env.QORE_REST||undefined;
+// Hybrid PQC sign-bytes come in two forms and a network accepts exactly one at a time:
+//   v1 (legacy): BE32(len b0) ‖ b0 ‖ BE32(len a) ‖ a
+//   v2:          "qorechain-pqc-hybrid-v2" ‖ BE64(len chainId) ‖ chainId ‖ v1-layout
+// qorechain-vladi / qorechain-diana verify v1 until the upgrade carrying the switch is applied
+// (plan 'v3.2.0' on mainnet, 'v3.1.98' on the testnet — either one counts), v2 after; any other
+// chain verifies v2. 'auto' asks the LCD (`rest`) for both names, see @qorechain/wallet-adapter.
 const encExt=(id,sig)=>{const vi=n=>{const b=[];while(n>0x7f){b.push((n&0x7f)|0x80);n>>>=7;}b.push(n);return b;};return Uint8Array.from([0x08,...vi(id),0x12,...vi(sig.length),...sig]);};
 
 export class QoreConnect {
@@ -23,19 +29,35 @@ export class QoreConnect {
     return {vm:'evm',hash,pqc:false};
   }
   // Cosmos (PQC-required): wallet signDirect's the final body; connector layers ML-DSA-87.
-  static async sendCosmos(w,{address,pubkey,mlsk,acct,seq,to,amount}){
+  // signBytesVersion: 'auto' (default; needs `rest` = LCD URL on vladi/diana) | 'v1' | 'v2'.
+  // With 'auto', a refusal with pqc code 21 re-resolves once and, if the answer changed,
+  // re-signs and broadcasts once more; any other outcome is returned as-is.
+  static async sendCosmos(w,{address,pubkey,mlsk,acct,seq,to,amount,chainId=CHAIN,rpc=RPC,rest=REST,signBytesVersion='auto',fetch:fx}){
+    const mode=signBytesVersion??'auto';
+    const ro={chainId,rest,signBytesVersion:mode,...(fx?{fetch:fx}:{})};
+    const post=fx||globalThis.fetch;
+    let version=await resolveSignBytesVersion(ro);
+    let r=await this._cosmosOnce(w,{address,pubkey,mlsk,acct,seq,to,amount,chainId,rpc,version,post});
+    if(mode==='auto'&&isHybridSignBytesRejection(r)){
+      const fresh=await resolveSignBytesVersion({...ro,forceRefresh:true});
+      if(fresh!==version){version=fresh;r=await this._cosmosOnce(w,{address,pubkey,mlsk,acct,seq,to,amount,chainId,rpc,version,post});}
+    }
+    return {vm:'cosmos',code:r.code,hash:r.hash,pqc:true,signBytesVersion:version,...(r.code?{codespace:r.codespace,log:r.log}:{})};
+  }
+  static async _cosmosOnce(w,{address,pubkey,mlsk,acct,seq,to,amount,chainId,rpc,version,post}){
     const pubAny={typeUrl:'/cosmos.crypto.secp256k1.PubKey',value:PubKey.encode(PubKey.fromPartial({key:pubkey})).finish()};
     const msg={typeUrl:'/cosmos.bank.v1beta1.MsgSend',value:MsgSend.encode(MsgSend.fromPartial({fromAddress:address,toAddress:to,amount:[{denom:'uqor',amount}]})).finish()};
     const authInfo=AuthInfo.fromPartial({signerInfos:[SignerInfo.fromPartial({publicKey:pubAny,modeInfo:ModeInfo.fromPartial({single:{mode:SignMode.SIGN_MODE_DIRECT}}),sequence:BigInt(seq)})],fee:Fee.fromPartial({amount:[{denom:'uqor',amount:'25000'}],gasLimit:200000n})});
     const aib=AuthInfo.encode(authInfo).finish();
     const b0=TxBody.encode(TxBody.fromPartial({messages:[msg]})).finish();
-    const pqcSig=ml_dsa87.sign(frame(b0,aib),mlsk);                                  // <-- the PQC layer
+    const pqcSig=ml_dsa87.sign(hybridSignBytes(version,chainId,b0,aib),mlsk,{extraEntropy:false}); // <-- the PQC layer (deterministic, as the chain requires)
     const bodyExt=TxBody.encode(TxBody.fromPartial({messages:[msg],extensionOptions:[{typeUrl:'/qorechain.pqc.v1.PQCHybridSignature',value:encExt(1,pqcSig)}]})).finish();
-    const signDoc=SignDoc.fromPartial({bodyBytes:bodyExt,authInfoBytes:aib,chainId:CHAIN,accountNumber:BigInt(acct)});
+    const signDoc=SignDoc.fromPartial({bodyBytes:bodyExt,authInfoBytes:aib,chainId,accountNumber:BigInt(acct)});
     const {signature}=await w.signDirect(address,signDoc);                           // <-- wallet's standard signature
     const txRaw=TxRaw.encode(TxRaw.fromPartial({bodyBytes:bodyExt,authInfoBytes:aib,signatures:[Uint8Array.from(Buffer.from(signature.signature,'base64'))]})).finish();
-    const r=await(await fetch(RPC,{method:'POST',headers:{'content-type':'application/json'},body:JSON.stringify({jsonrpc:'2.0',id:1,method:'broadcast_tx_sync',params:{tx:Buffer.from(txRaw).toString('base64')}})})).json();
-    return {vm:'cosmos',code:r.result.code,hash:r.result.hash,pqc:true};
+    const r=await(await post(rpc,{method:'POST',headers:{'content-type':'application/json'},body:JSON.stringify({jsonrpc:'2.0',id:1,method:'broadcast_tx_sync',params:{tx:Buffer.from(txRaw).toString('base64')}})})).json();
+    if(!r.result) throw new Error(`broadcast_tx_sync failed: ${JSON.stringify(r.error||r)}`);
+    return r.result;
   }
   // SVM: Solana wallets read natively; execute goes through the cosmos-PQC path.
   static async readSvm(w){