@carbonx3/cx3.js 0.1.1 → 0.3.0

package/src/wallet.js

@@ -4,13 +4,21 @@ const {
     privateKeyToAddress,
     privateKeyToPublicKey,
     signMessage,
+    signPersonalMessage,
     createPrivateKey
 } = require("./crypto");
-const { normalizeAddress } = require("./utils");
+const { normalizeAddress, toJsonSafe } = require("./utils");
 const { Cx3Error } = require("./errors");
 const { buildDeployDigest, buildSendDigest, buildOwnerActionDigest, buildTransferPayload, stripNativeAddress } = require("./digest");
 const { TransactionResponse } = require("./transaction");
 
+/** Green Chain deploy rule: a token symbol is capital letters A-Z and digits 0-9 only. */
+const TOKEN_SYMBOL_RE = /^[A-Z0-9]+$/;
+
+function isValidTokenSymbol(symbol) {
+    return TOKEN_SYMBOL_RE.test(String(symbol == null ? "" : symbol));
+}
+
 /**
  * Local secp256k1 wallet for Green Chain digests.
  */
@@ -39,11 +47,24 @@ class Cx3Wallet {
         return this.address;
     }
 
+    /** Sign raw bytes / a digest string as given (sha256 + secp256k1): the typed digests use this. */
     async signMessage(message) {
         return signMessage(message, this._privateKey);
     }
 
-    async signDeploy(fields) {
+    /** Sign a site message the way the CX3Wallet extension and app do (with the site-message prefix). */
+    async signPersonalMessage(message) {
+        return signPersonalMessage(message, this._privateKey);
+    }
+
+    /** The network identity typed digests bind: `opts.chainId` + `opts.genesisHash`, else the provider's. */
+    async _identity(opts = {}) {
+        if (opts.chainId && opts.genesisHash) return { chainId: opts.chainId, genesisHash: opts.genesisHash };
+        if (!this.provider) throw new Cx3Error("chainId and genesisHash required without a provider", "NO_CHAIN_IDENTITY");
+        return this.provider.getChainIdentity();
+    }
+
+    async signDeploy(fields, opts = {}) {
         const owner = normalizeAddress(fields.owner || this.address);
         const timestamp = fields.timestamp || Date.now();
         const digest = buildDeployDigest({
@@ -54,7 +75,7 @@ class Cx3Wallet {
             decimals: fields.decimals,
             initialSupply: fields.initialSupply,
             timestamp
-        });
+        }, await this._identity(opts));
         const signed = await this.signMessage(digest);
         return {
             ...signed,
@@ -64,23 +85,25 @@ class Cx3Wallet {
         };
     }
 
-    async signSend(contractAddress, method, params) {
+    async signSend(contractAddress, method, params, opts = {}) {
         const fromAddress = this.address;
         const timestamp = Date.now();
-        const digest = buildSendDigest(contractAddress, method, params || {}, fromAddress, timestamp);
+        const safeParams = toJsonSafe(params || {});
+        const digest = buildSendDigest(contractAddress, method, safeParams, fromAddress, timestamp, await this._identity(opts));
         const signed = await this.signMessage(digest);
         return {
             ...signed,
             fromAddress,
             timestamp,
+            params: safeParams,
             digest
         };
     }
 
-    async signOwnerAction(action, address, owner = null) {
+    async signOwnerAction(action, address, owner = null, opts = {}) {
         const own = normalizeAddress(owner || this.address);
         const timestamp = Date.now();
-        const digest = buildOwnerActionDigest(action, address, own, timestamp);
+        const digest = buildOwnerActionDigest(action, address, own, timestamp, await this._identity(opts));
         const signed = await this.signMessage(digest);
         return {
             ...signed,
@@ -91,10 +114,15 @@ class Cx3Wallet {
     }
 
     /**
-     * Signed state-changing call via attached provider.
+     * Signed state-changing call via attached provider. A transfer / transferFrom / mint of a private
+     * token is checked first (PRIVATE_TOKEN_SENDER / PRIVATE_TOKEN_RECIPIENT); `privateCheck: false`
+     * skips that.
      */
     async sendTransaction(contractAddress, method, params = {}, opts = {}) {
         if (!this.provider) throw new Cx3Error("Wallet has no provider", "NO_PROVIDER");
+        if (opts.privateCheck !== false && typeof this.provider.checkPrivateTokenSend === "function") {
+            await this.provider.checkPrivateTokenSend(contractAddress, method, params, this.address);
+        }
         const signed = await this.signSend(contractAddress, method, params);
         const body = {
             fromAddress: signed.fromAddress,
@@ -103,7 +131,8 @@ class Cx3Wallet {
             timestamp: signed.timestamp
         };
         const asyncMode = opts.wait === 0 || opts.async === true;
-        const result = await this.provider.send(contractAddress, method, params, {
+        // send exactly the params that were signed (BigInt already as strings)
+        const result = await this.provider.send(contractAddress, method, signed.params, {
             ...body,
             wait: asyncMode ? 0 : undefined
         });
@@ -111,10 +140,24 @@ class Cx3Wallet {
     }
 
     /**
-     * Deploy via Green Chain `POST /deployContract`.
+     * Deploy via Green Chain `POST /deployContract`. A symbol outside A-Z / 0-9 is refused here,
+     * before signing (INVALID_TOKEN_SYMBOL); the chain also refuses a symbol already in use
+     * (Cx3HttpError code DUPLICATE_TOKEN_SYMBOL, status 409).
      */
     async deployContract(fields) {
         if (!this.provider) throw new Cx3Error("Wallet has no provider", "NO_PROVIDER");
+        fields = toJsonSafe(fields || {});
+        const ctor = fields.constructorArgs && typeof fields.constructorArgs === "object" && !Array.isArray(fields.constructorArgs) ? fields.constructorArgs : {};
+        for (const symbol of [fields.symbol, ctor.symbol]) {
+            if (symbol === undefined || symbol === null || symbol === "") continue;
+            if (!isValidTokenSymbol(symbol)) {
+                throw new Cx3Error(
+                    "The token symbol may contain only capital letters A-Z and digits 0-9 (no lowercase or Turkish letters)",
+                    "INVALID_TOKEN_SYMBOL",
+                    { symbol: String(symbol) }
+                );
+            }
+        }
         const signed = await this.signDeploy({
             ...fields,
             owner: fields.owner || this.address
@@ -203,6 +246,10 @@ class Cx3Wallet {
                 nonce = await this.provider.getNonce(this.address);
             }
         }
+        // the signature covers the network's chainId + genesis hash: asked from the network unless given
+        const identity = opts.chainId && opts.genesisHash
+            ? { chainId: opts.chainId, genesisHash: opts.genesisHash }
+            : await this.provider.getChainIdentity();
         const timestamp = opts.timestamp || Date.now();
         const payload = buildTransferPayload({
             fromAddress: this.address,
@@ -213,8 +260,8 @@ class Cx3Wallet {
             data: opts.data || null,
             gasLimit: opts.gasLimit,
             gasPrice: opts.gasPrice,
-            chainId: opts.chainId,
-            chainIdBind: opts.chainIdBind
+            chainId: identity.chainId,
+            genesisHash: identity.genesisHash
         });
         const signed = await this.signMessage(payload);
         const body = {
@@ -225,6 +272,9 @@ class Cx3Wallet {
             nonce,
             timestamp,
             data: opts.data || null,
+            // the node rebuilds the signed payload from these fields
+            ...(typeof opts.gasLimit === "number" && opts.gasLimit > 0 ? { gasLimit: opts.gasLimit } : {}),
+            ...(typeof opts.gasPrice === "number" && opts.gasPrice > 0 ? { gasPrice: opts.gasPrice } : {}),
             r: signed.signature,
             s: null,
             v: signed.v,
@@ -244,4 +294,4 @@ class Cx3Wallet {
     }
 }
 
-module.exports = { Cx3Wallet };
+module.exports = { Cx3Wallet, isValidTokenSymbol };