@offckb/cli 0.3.0-rc5 → 0.3.0-rc6

package/README.md

@@ -365,7 +365,7 @@ detail informations about each account are recorded in the `account/account.json
 
 ## About CCC
 
-`offckb` uses [CCC](https://github.com/ckb-ecofund/ccc) as the development framework to build the CKB dApp template projects.
+`offckb` uses [CCC](https://github.com/ckb-devrel/ccc) as the development framework to build the CKB dApp template projects.
 
 ## FAQ
 

package/dist/cfg/setting.js

@@ -72,8 +72,8 @@ exports.defaultSettings = {
         contractsPath: path.resolve(exports.dataPath, 'mainnet/contracts'),
     },
     dappTemplate: {
-        gitRepoUrl: `https://github.com/ckb-ecofund/offckb`,
-        gitBranch: 'v0.3.x',
+        gitRepoUrl: `https://github.com/ckb-devrel/offckb`,
+        gitBranch: 'master',
         gitFolder: 'templates/v3',
         downloadPath: path.resolve(exports.cachePath, 'download', 'dapp-template'),
     },

package/dist/cli.js

@@ -101,6 +101,7 @@ program
     .command('deposit [toAddress] [amountInCKB]')
     .description('Deposit CKB tokens to address, only devnet and testnet')
     .option('--network <network>', 'Specify the network to deposit to', 'devnet')
+    .option('-r, --proxy-rpc', 'Use Proxy RPC to connect to blockchain')
     .action((toAddress, amountInCKB, options) => __awaiter(void 0, void 0, void 0, function* () {
     return (0, deposit_1.deposit)(toAddress, amountInCKB, options);
 }));
@@ -108,7 +109,8 @@ program
     .command('transfer [toAddress] [amountInCKB]')
     .description('Transfer CKB tokens to address, only devnet and testnet')
     .option('--network <network>', 'Specify the network to transfer to', 'devnet')
-    .option('--privkey <privkey>', 'Specify the private key to deploy scripts')
+    .option('--privkey <privkey>', 'Specify the private key to transfer CKB')
+    .option('-r, --proxy-rpc', 'Use Proxy RPC to connect to blockchain')
     .action((toAddress, amountInCKB, options) => __awaiter(void 0, void 0, void 0, function* () {
     return (0, transfer_1.transfer)(toAddress, amountInCKB, options);
 }));
@@ -117,6 +119,7 @@ program
     .description('Transfer All CKB tokens to address, only devnet and testnet')
     .option('--network <network>', 'Specify the network to transfer to', 'devnet')
     .option('--privkey <privkey>', 'Specify the private key to deploy scripts')
+    .option('-r, --proxy-rpc', 'Use Proxy RPC to connect to blockchain')
     .action((toAddress, options) => __awaiter(void 0, void 0, void 0, function* () {
     return (0, transfer_all_1.transferAll)(toAddress, options);
 }));
@@ -134,6 +137,7 @@ program
     .option('--target <target>', 'Specify the relative bin target folder to deploy to')
     .option('-t, --type-id', 'Specify if use upgradable type id to deploy the script')
     .option('--privkey <privkey>', 'Specify the private key to deploy scripts')
+    .option('-r, --proxy-rpc', 'Use Proxy RPC to connect to blockchain')
     .action((options) => (0, deploy_1.deploy)(options));
 program
     .command('my-scripts')

package/dist/cmd/deploy.d.ts

@@ -3,5 +3,6 @@ export interface DeployOptions extends NetworkOption {
     target: string | null | undefined;
     privkey?: string | null;
     typeId?: boolean;
+    proxyRpc?: boolean;
 }
 export declare function deploy(opt?: DeployOptions): Promise<void>;

package/dist/cmd/deploy.js

@@ -20,12 +20,13 @@ const fs_1 = require("../util/fs");
 const validator_1 = require("../util/validator");
 const deploy_1 = require("../deploy");
 const ckb_1 = require("../sdk/ckb");
-function deploy(opt = { network: base_1.Network.devnet, typeId: false, target: null }) {
+function deploy(opt = { network: base_1.Network.devnet, typeId: false, target: null, proxyRpc: false }) {
     var _a;
     return __awaiter(this, void 0, void 0, function* () {
         const network = opt.network;
         (0, validator_1.validateNetworkOpt)(network);
-        const ckb = new ckb_1.CKB({ network });
+        const isEnableProxyRpc = opt.proxyRpc;
+        const ckb = new ckb_1.CKB({ network, isEnableProxyRpc });
         // we use deployerAccount to deploy contract by default
         const privateKey = opt.privkey || account_1.deployerAccount.privkey;
         const enableTypeId = (_a = opt.typeId) !== null && _a !== void 0 ? _a : false;

package/dist/cmd/deposit.d.ts

@@ -1,4 +1,5 @@
 import { NetworkOption } from '../type/base';
 export interface DepositOptions extends NetworkOption {
+    proxyRpc?: boolean;
 }
 export declare function deposit(toAddress: string, amountInCKB: string, opt?: DepositOptions): Promise<void>;

package/dist/cmd/deposit.js

@@ -16,11 +16,12 @@ const base_1 = require("../type/base");
 const link_1 = require("../util/link");
 const validator_1 = require("../util/validator");
 const request_1 = require("../util/request");
-function deposit(toAddress, amountInCKB, opt = { network: base_1.Network.devnet }) {
+function deposit(toAddress, amountInCKB, opt = { network: base_1.Network.devnet, proxyRpc: false }) {
     return __awaiter(this, void 0, void 0, function* () {
         const network = opt.network;
         (0, validator_1.validateNetworkOpt)(network);
-        const ckb = new ckb_1.CKB({ network });
+        const isEnableProxyRpc = opt.proxyRpc;
+        const ckb = new ckb_1.CKB({ network, isEnableProxyRpc });
         if (network === 'testnet') {
             return yield depositFromTestnetFaucet(toAddress, ckb);
         }

package/dist/cmd/transfer-all.d.ts

@@ -1,5 +1,6 @@
 import { NetworkOption } from '../type/base';
 export interface TransferAllOptions extends NetworkOption {
     privkey?: string | null;
+    proxyRpc?: boolean;
 }
 export declare function transferAll(toAddress: string, opt?: TransferAllOptions): Promise<void>;

package/dist/cmd/transfer-all.js

@@ -14,15 +14,16 @@ const ckb_1 = require("../sdk/ckb");
 const base_1 = require("../type/base");
 const link_1 = require("../util/link");
 const validator_1 = require("../util/validator");
-function transferAll(toAddress, opt = { network: base_1.Network.devnet }) {
+function transferAll(toAddress, opt = { network: base_1.Network.devnet, proxyRpc: false }) {
     return __awaiter(this, void 0, void 0, function* () {
         const network = opt.network;
         (0, validator_1.validateNetworkOpt)(network);
         if (opt.privkey == null) {
             throw new Error('--privkey is required!');
         }
+        const isEnableProxyRpc = opt.proxyRpc;
         const privateKey = opt.privkey;
-        const ckb = new ckb_1.CKB({ network });
+        const ckb = new ckb_1.CKB({ network, isEnableProxyRpc });
         const txHash = yield ckb.transferAll({
             toAddress,
             privateKey,

package/dist/cmd/transfer.d.ts

@@ -1,5 +1,6 @@
 import { NetworkOption } from '../type/base';
 export interface TransferOptions extends NetworkOption {
     privkey?: string | null;
+    proxyRpc?: boolean;
 }
 export declare function transfer(toAddress: string, amountInCKB: string, opt?: TransferOptions): Promise<void>;

package/dist/cmd/transfer.js

@@ -14,15 +14,16 @@ const ckb_1 = require("../sdk/ckb");
 const base_1 = require("../type/base");
 const link_1 = require("../util/link");
 const validator_1 = require("../util/validator");
-function transfer(toAddress, amountInCKB, opt = { network: base_1.Network.devnet }) {
+function transfer(toAddress, amountInCKB, opt = { network: base_1.Network.devnet, proxyRpc: false }) {
     return __awaiter(this, void 0, void 0, function* () {
         const network = opt.network;
         (0, validator_1.validateNetworkOpt)(network);
         if (opt.privkey == null) {
             throw new Error('--privkey is required!');
         }
+        const isEnableProxyRpc = opt.proxyRpc;
         const privateKey = opt.privkey;
-        const ckb = new ckb_1.CKB({ network });
+        const ckb = new ckb_1.CKB({ network, isEnableProxyRpc });
         const txHash = yield ckb.transfer({
             toAddress,
             amountInCKB,

package/dist/template/option.js

@@ -1,11 +1,23 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadBareTemplateOpts = void 0;
-const option_json_1 = __importDefault(require("./option.json"));
+const templates = [
+    {
+        name: 'Remix-Vite Bare Templates',
+        value: 'remix-vite-template',
+        description: 'A full-stack template with Remix-vite and ckb-script-templates',
+        tag: ['remix', 'vite', 'tailwindcss', 'ckb-script-templates', 'typescript', 'rust'],
+        author: 'retric@cryptape.com',
+    },
+    {
+        name: 'Next.js Bare Templates',
+        value: 'next-js-template',
+        description: 'A full-stack template with Next.js framework and ckb-script-templates',
+        tag: ['next.js', 'tailwindcss', 'ckb-script-templates', 'typescript', 'rust'],
+        author: 'retric@cryptape.com',
+    },
+];
 function loadBareTemplateOpts() {
-    return option_json_1.default;
+    return templates;
 }
 exports.loadBareTemplateOpts = loadBareTemplateOpts;

package/dist/tools/rpc-proxy.d.ts

@@ -2,7 +2,6 @@
 import http from 'http';
 import { Network } from '../type/base';
 export declare function createRPCProxy(network: Network, targetRpcUrl: string, port: number): {
-    server: http.Server<typeof http.IncomingMessage, typeof http.ServerResponse>;
     network: Network;
     start: () => http.Server<typeof http.IncomingMessage, typeof http.ServerResponse>;
     stop: () => http.Server<typeof http.IncomingMessage, typeof http.ServerResponse>;

package/dist/tools/rpc-proxy.js

@@ -16,6 +16,37 @@ function createRPCProxy(network, targetRpcUrl, port) {
     const proxy = http_proxy_1.default.createProxyServer({
         target: targetRpcUrl, // Target RPC server
     });
+    proxy.on('proxyReq', (_, req) => {
+        let reqData = '';
+        req.on('data', (chunk) => {
+            reqData += chunk;
+        });
+        req.on('end', () => {
+            try {
+                const jsonRpcContent = JSON.parse(reqData);
+                const method = jsonRpcContent.method;
+                const params = jsonRpcContent.params;
+                console.debug('RPC Req: ', method);
+                if (method === 'send_transaction') {
+                    const tx = params[0];
+                    // todo: record tx
+                    if (network === base_1.Network.devnet) {
+                        const cccTx = cccA.JsonRpcTransformers.transactionTo(tx);
+                        const txHash = cccTx.hash();
+                        const settings = (0, setting_1.readSettings)();
+                        if (!fs_1.default.existsSync(settings.devnet.transactionsPath)) {
+                            fs_1.default.mkdirSync(settings.devnet.transactionsPath);
+                        }
+                        const txFile = path_1.default.resolve(settings.devnet.transactionsPath, `${txHash}.json`);
+                        fs_1.default.writeFileSync(txFile, JSON.stringify(tx, null, 2));
+                    }
+                }
+            }
+            catch (err) {
+                console.error('Error parsing JSON-RPC content:', err);
+            }
+        });
+    });
     const server = http_1.default.createServer((req, res) => {
         proxy.web(req, res, {}, (err) => {
             if (err) {
@@ -24,52 +55,8 @@ function createRPCProxy(network, targetRpcUrl, port) {
                 res.end('Proxy error');
             }
         });
-        proxy.on('proxyReq', (_, req) => {
-            let reqData = '';
-            req.on('data', (chunk) => {
-                reqData += chunk;
-            });
-            req.on('end', () => {
-                try {
-                    const jsonRpcContent = JSON.parse(reqData);
-                    console.debug('Incoming Request: ', jsonRpcContent);
-                    const method = jsonRpcContent.method;
-                    const params = jsonRpcContent.params;
-                    if (method === 'send_transaction') {
-                        const tx = params[0];
-                        // todo: record tx
-                        if (network === base_1.Network.devnet) {
-                            const cccTx = cccA.JsonRpcTransformers.transactionTo(tx);
-                            const txHash = cccTx.hash();
-                            const settings = (0, setting_1.readSettings)();
-                            console.log('txHash: ', txHash, settings, settings.devnet.transactionsPath);
-                            if (!fs_1.default.existsSync(settings.devnet.transactionsPath)) {
-                                fs_1.default.mkdirSync(settings.devnet.transactionsPath);
-                            }
-                            const txFile = path_1.default.resolve(settings.devnet.transactionsPath, `${txHash}.json`);
-                            fs_1.default.writeFileSync(txFile, JSON.stringify(tx, null, 2));
-                        }
-                    }
-                }
-                catch (err) {
-                    console.error('Error parsing JSON-RPC content:', err);
-                }
-            });
-        });
-        // Capture the content from the response (or request)
-        proxy.on('proxyRes', (proxyRes) => {
-            let data = '';
-            proxyRes.on('data', (chunk) => {
-                data += chunk;
-            });
-            proxyRes.on('end', () => {
-                console.log('Captured content:', data);
-                // Do something with the captured content
-            });
-        });
     });
     return {
-        server,
         network,
         start: () => {
             return server.listen(port, () => {

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@offckb/cli",
-  "version": "0.3.0-rc5",
+  "version": "0.3.0-rc6",
   "description": "ckb development network for your first try",
   "author": "CKB EcoFund",
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/ckb-ecofund/offckb.git"
+    "url": "git+https://github.com/ckb-devrel/offckb.git"
   },
   "main": "dist/cli.js",
   "bin": {

package/dist/template/option.json

@@ -1,16 +0,0 @@
-[
-    {
-        "name": "Remix-Vite Bare Templates",
-        "value": "remix-vite-template",
-        "description": "A full-stack template with Remix-vite and ckb-script-templates",
-        "tag": ["remix", "vite", "tailwindcss", "ckb-script-templates", "typescript", "rust"],
-        "author": "retric@cryptape.com"
-    },
-    {
-        "name": "Next.js Bare Templates",
-        "value": "next-js-template",
-        "description": "A full-stack template with Next.js framework and ckb-script-templates",
-        "tag": ["next.js", "tailwindcss", "ckb-script-templates", "typescript", "rust"],
-        "author": "retric@cryptape.com"
-    }
-]