@ocap/client 1.6.5 → 1.6.10

package/package.json

@@ -1,11 +1,10 @@
 {
   "name": "@ocap/client",
-  "version": "1.6.5",
+  "version": "1.6.10",
   "description": "graphql client to read/write data on forge powered blockchain",
   "keywords": [
     "graphql",
     "client",
-    "forge",
     "blockchain",
     "arcblock"
   ],
@@ -17,7 +16,10 @@
     "email": "shijun@arcblock.io",
     "url": "https://github.com/wangshijun"
   },
-  "homepage": "https://github.com/arcblock/ocap-js/forge/graphql-client",
+  "contributors": [
+    "wangshijun <shijun@arcblock.io> (https://github.com/wangshijun)"
+  ],
+  "homepage": "https://github.com/arcblock/asset-chain/forge/graphql-client",
   "license": "Apache-2.0",
   "main": "./lib/node.js",
   "browser": "./dist/browser.js",
@@ -28,40 +30,37 @@
     "lib"
   ],
   "dependencies": {
-    "@arcblock/did": "^1.6.5",
-    "@arcblock/did-util": "^1.6.5",
-    "@arcblock/sdk-util": "^0.29.1",
-    "@ocap/mcrypto": "^1.6.5",
-    "@ocap/message": "^1.6.5",
-    "@ocap/proto": "^1.6.5",
-    "@ocap/util": "^1.6.5",
-    "@ocap/wallet": "^1.6.5",
+    "@arcblock/did": "1.6.10",
+    "@arcblock/did-util": "1.6.10",
+    "@arcblock/sdk-util": "^0.30.0",
+    "@arcblock/ws": "1.6.10",
+    "@ocap/asset": "1.6.10",
+    "@ocap/mcrypto": "1.6.10",
+    "@ocap/message": "1.6.10",
+    "@ocap/proto": "1.6.10",
+    "@ocap/util": "1.6.10",
+    "@ocap/wallet": "1.6.10",
     "blueimp-md5": "^2.10.0",
-    "debug": "^4.3.1",
+    "debug": "^4.3.3",
+    "is-absolute-url": "^3.0.3",
     "jsonpack": "^1.1.5",
     "lodash": "^4.17.21",
-    "phoenix-channels": "^1.0.0",
     "react-app-polyfill": "^1.0.1",
     "wolfy87-eventemitter": "^5.2.5"
   },
   "devDependencies": {
-    "@arcblock/did-util": "^1.6.0",
-    "@ocap/util": "^1.6.0",
-    "@ocap/wallet": "^1.6.0",
-    "axios": "^0.21.1",
-    "axios-mock-adapter": "^1.19.0",
     "babel-cli": "^6.26.0",
     "babel-plugin-inline-import": "^3.0.0",
     "babel-preset-env": "^1.7.0",
-    "eslint": "6.8.0",
+    "eslint": "^7.31.0",
     "graphql": "14.6.0",
-    "graphql-request": "^1.8.2",
+    "graphql-request": "^4.2.0",
     "inspectpack": "^4.2.1",
-    "jest": "^26.6.3",
-    "jsdoc-to-markdown": "^5.0.0",
-    "prettier": "^2.2.1",
-    "remark-cli": "^5.0.0",
-    "remark-preset-github": "^0.0.9",
+    "jest": "^27.3.1",
+    "jsdoc-to-markdown": "^7.1.1",
+    "prettier": "^2.3.2",
+    "remark-cli": "^10.0.1",
+    "remark-preset-github": "^4.0.1",
     "rimraf": "^2.6.2",
     "shelljs": "^0.8.3",
     "webpack": "^4.29.6",
@@ -72,9 +71,8 @@
     "plugins": [
       "preset-github",
       [
-        "validate-links",
         {
-          "repository": "ArcBlock/ocap-js"
+          "repository": "ArcBlock/asset-chain"
         }
       ]
     ]
@@ -96,16 +94,16 @@
     "update-schema": "rm -f src/schema/graphql.json && node tools/update-graphql-schema.js",
     "upgrade": "npm run update-schema && npm run build && npm run gen-queries && npm run gen-types && npm run docs && npm run build && npm run lint:fix",
     "docs": "npm run gen-dts && npm run gen-docs && npm run cleanup-docs && npm run format-docs",
-    "cleanup-docs": "node ../../tools/cleanup-docs.js docs/README.md $npm_package_name",
-    "test": "node tools/jest.js",
+    "cleanup-docs": "node ../../scripts/cleanup-docs.js docs/README.md $npm_package_name",
+    "test": "jest --forceExit --detectOpenHandles",
     "coverage": "npm run test -- --coverage"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/ArcBlock/ocap-js.git"
+    "url": "git+https://github.com/ArcBlock/asset-chain.git"
   },
   "bugs": {
-    "url": "https://github.com/ArcBlock/ocap-js/issues"
+    "url": "https://github.com/ArcBlock/asset-chain/issues"
   },
-  "gitHead": "5779448f13824de38978df3c84c9da0c1e1ad989"
+  "gitHead": "ab272e8db3a15c6571cc7fae7cc3d3e0fdd4bdb1"
 }

package/examples/atomic_swap.js

@@ -1,145 +0,0 @@
-/* eslint-disable import/no-extraneous-dependencies */
-/* eslint no-console:"off" */
-
-/**
- * This script demonstrates how to do atomic swap between two chains
- * This script requires 2 running chain
- *
- * Run script with: `DEBUG=@ocap/client node examples/atomic_swap.js`
- */
-
-const GraphQLClient = require('@ocap/client');
-const { getRandomBytes, Hasher } = require('@ocap/mcrypto');
-const { fromRandom } = require('@ocap/wallet');
-
-const appChain = new GraphQLClient({ endpoint: 'http://localhost:8210/api' });
-const assetChain = new GraphQLClient({ endpoint: 'http://localhost:8211/api' });
-
-const sleep = (timeout) => new Promise((resolve) => setTimeout(resolve, timeout));
-
-(async () => {
-  try {
-    const buyer = fromRandom();
-    const seller = fromRandom();
-    console.log({
-      buyer: buyer.toJSON(),
-      seller: seller.toJSON(),
-    });
-
-    const declare = async (wallet, moniker) => {
-      let hash = await appChain.declare({ moniker, wallet });
-      console.log(`declare.appChain.${moniker}`, hash);
-
-      hash = await assetChain.declare({ moniker, wallet });
-      console.log(`declare.assetChain.${moniker}`, hash);
-    };
-
-    // declare
-    await declare(buyer, 'buyer');
-    await declare(seller, 'seller');
-
-    // 3. ensure asset for seller on app chain
-    const ensureSellerAsset = async () => {
-      const [hash, address] = await appChain.createAsset({
-        moniker: 'asset',
-        data: {
-          typeUrl: 'json',
-          value: {
-            key: 'value2',
-            sn: Math.random(),
-          },
-        },
-        wallet: seller,
-      });
-      console.log('ensureSellerAsset', hash, address);
-      return address;
-    };
-
-    // ensure token for buyer on asset chain
-    const ensureBuyerToken = async () => {
-      const hash = await assetChain.checkin({ wallet: buyer });
-      console.log('ensureSellerAsset', hash);
-    };
-
-    // setup swap on asset chain
-    const doBuyerSetup = async (asset, hashlock) => {
-      const hash = await assetChain.setupSwap({
-        token: 10,
-        assets: [],
-        receiver: seller.toAddress(),
-        hashlock,
-        wallet: buyer,
-      });
-      console.log('doBuyerSetup', hash);
-      return hash;
-    };
-
-    // setup swap on app chain
-    const doSellerSetup = async (asset, hashlock) => {
-      const hash = await appChain.setupSwap({
-        token: 0,
-        assets: [asset],
-        receiver: buyer.toAddress(),
-        hashlock,
-        wallet: seller,
-      });
-      console.log('doSellerSetup', hash);
-      return hash;
-    };
-
-    // retrieve swap on app chain
-    const doBuyerRetrieve = async (address, hashkey) => {
-      const hash = await appChain.retrieveSwap({
-        address,
-        hashkey,
-        wallet: buyer,
-      });
-      console.log('doBuyerRetrieve', hash);
-    };
-
-    // retrieve swap on asset chain
-    const doSellerRetrieve = async (address, hashkey) => {
-      const hash = await assetChain.retrieveSwap({
-        address,
-        hashkey,
-        wallet: seller,
-      });
-      console.log('doSellerRetrieve', hash);
-    };
-
-    // token and asset
-    const asset = await ensureSellerAsset();
-    console.log('asset', asset);
-    await ensureBuyerToken();
-    await sleep(3000);
-
-    // Setup swap by buyer
-    const hashkey = getRandomBytes(32);
-    const hashlock = Hasher.SHA3.hash256(hashkey);
-    const [buyerSetupHash, buyerSwapAddress] = await doBuyerSetup(asset, hashlock);
-    const [sellerSetupHash, sellerSwapAddress] = await doSellerSetup(asset, hashlock);
-    console.log('setup', {
-      hashkey,
-      hashlock,
-      buyerSetupHash,
-      buyerSwapAddress,
-      sellerSetupHash,
-      sellerSwapAddress,
-    });
-    await sleep(3000);
-
-    // Inspect swap
-    const buyerSwapState = await assetChain.getSwapState({ address: buyerSwapAddress });
-    const sellerSwapState = await appChain.getSwapState({ address: sellerSwapAddress });
-    console.log('buyerSwapState', buyerSwapState);
-    console.log('sellerSwapState', sellerSwapState);
-
-    await doBuyerRetrieve(sellerSwapAddress, hashkey);
-    await doSellerRetrieve(buyerSwapAddress, hashkey);
-
-    // TODO: validate swap
-  } catch (err) {
-    console.error(err);
-    console.log(JSON.stringify(err.errors));
-  }
-})();

package/examples/consume_asset_gatekeeper.js

@@ -1,105 +0,0 @@
-/* eslint-disable import/no-extraneous-dependencies */
-/* eslint no-console:"off" */
-
-/**
- * This script demonstrates the whole workflow of consume assets with graphql-client
- *
- * Run script with: `DEBUG=@ocap/client node examples/consume_asset_gatekeeper.js`
- */
-
-const GraphQLClient = require('@ocap/client');
-const { fromRandom } = require('@ocap/wallet');
-
-const endpoint = process.env.FORGE_API_HOST || 'http://127.0.0.1:8210'; // testnet
-
-const client = new GraphQLClient(`${endpoint}/api`);
-const sleep = (timeout) => new Promise((resolve) => setTimeout(resolve, timeout));
-
-(async () => {
-  try {
-    const issuer = fromRandom(); // the one create asset and responsible for consuming asset
-    const consumer = fromRandom(); // the one bought the asset and want to use it
-    const gateKeeper = fromRandom(); // the gateKeeper that is responsible to consume the asset
-    console.log({
-      issuer: issuer.toAddress(),
-      consumer: consumer.toAddress(),
-      gateKeeper: gateKeeper.toAddress(),
-    });
-
-    // 1. declare issuer
-    let hash = await client.declare({ moniker: 'issuer', wallet: issuer });
-    console.log('issuer account', `${endpoint}/node/explorer/accounts/${issuer.toAddress()}`);
-    console.log('issuer tx', `${endpoint}/node/explorer/txs/${hash}`);
-
-    // 2. declare consumer
-    hash = await client.declare({ moniker: 'consumer', wallet: consumer });
-    console.log('consumer account', `${endpoint}/node/explorer/accounts/${consumer.toAddress()}`);
-    console.log('consumer tx', `${endpoint}/node/explorer/txs/${hash}`);
-
-    // 3. declare gate keeper
-    hash = await client.declare({
-      moniker: 'gateKeeper',
-      issuer: issuer.toAddress(),
-      wallet: gateKeeper,
-    });
-    console.log('gate keeper account', `${endpoint}/node/explorer/accounts/${gateKeeper.toAddress()}`);
-    console.log('gate keeper tx', `${endpoint}/node/explorer/txs/${hash}`);
-
-    // 4. create asset for issuer
-    let assetAddress;
-    // eslint-disable-next-line prefer-const
-    [hash, assetAddress] = await client.createAsset({
-      moniker: 'asset_to_be_consumed',
-      data: {
-        typeUrl: 'json',
-        value: {
-          sn: Math.random(), // To make this asset uniq every time this script runs
-          key: 'value2',
-        },
-      },
-      wallet: issuer,
-    });
-    console.log('view asset state', `${endpoint}/node/explorer/assets/${assetAddress}`);
-    console.log('view asset tx', `${endpoint}/node/explorer/txs/${hash}`);
-    await sleep(3000);
-
-    // 4. transfer asset from issuer to consumer
-    hash = await client.transfer({
-      to: consumer.toAddress(),
-      assets: [assetAddress],
-      wallet: issuer,
-    });
-    console.log('view transfer tx', `${endpoint}/node/explorer/txs/${hash}`);
-    await sleep(3000);
-    const { state } = await client.getAssetState({ address: assetAddress });
-    console.log('asset state', state);
-
-    // 5.1 issuer: encode and sign the transaction
-    const tx = await client.prepareConsumeAsset({
-      issuer: issuer.toAddress(),
-      wallet: gateKeeper,
-      // wallet: issuer,
-    });
-    // console.log('gateKeeper.signed', inspect(tx));
-    // console.log('issuer.signed', inspect(tx));
-
-    // 5.2 consumer: populate signatures field
-    const tx2 = await client.finalizeConsumeAsset({
-      tx,
-      wallet: consumer,
-      address: assetAddress,
-    });
-    // console.log('consumer.signed', inspect(tx2));
-
-    // 5.3 Send the consume tx
-    await sleep(3000);
-    hash = await client.consumeAsset({
-      tx: tx2,
-      wallet: consumer,
-    });
-    console.log('view consume tx', `${endpoint}/node/explorer/txs/${hash}`);
-  } catch (err) {
-    console.error(err);
-    console.log(JSON.stringify(err.errors));
-  }
-})();

package/examples/consume_asset_simple.js

@@ -1,91 +0,0 @@
-/* eslint-disable import/no-extraneous-dependencies */
-/* eslint no-console:"off" */
-
-/**
- * This script demonstrates the whole workflow of consume assets with graphql-client
- *
- * Run script with: `DEBUG=@ocap/client node examples/consume_asset_simple.js`
- */
-
-const GraphQLClient = require('@ocap/client');
-const { fromRandom } = require('@ocap/wallet');
-
-const endpoint = process.env.FORGE_API_HOST || 'http://127.0.0.1:8210'; // testnet
-
-const client = new GraphQLClient(`${endpoint}/api`);
-const sleep = (timeout) => new Promise((resolve) => setTimeout(resolve, timeout));
-
-(async () => {
-  try {
-    const issuer = fromRandom(); // the one create asset and responsible for consuming asset
-    const consumer = fromRandom(); // the one bought the asset and want to use it
-    console.log({
-      issuer: issuer.toAddress(),
-      consumer: consumer.toAddress(),
-    });
-
-    // 1. declare issuer
-    let hash = await client.declare({ moniker: 'issuer', wallet: issuer });
-    console.log('issuer account', `${endpoint}/node/explorer/accounts/${issuer.toAddress()}`);
-    console.log('issuer tx', `${endpoint}/node/explorer/txs/${hash}`);
-
-    // 2. declare consumer
-    hash = await client.declare({ moniker: 'consumer', wallet: consumer });
-    console.log('consumer account', `${endpoint}/node/explorer/accounts/${consumer.toAddress()}`);
-    console.log('consumer tx', `${endpoint}/node/explorer/txs/${hash}`);
-
-    // 3. create asset for issuer
-    let assetAddress;
-    // eslint-disable-next-line prefer-const
-    [hash, assetAddress] = await client.createAsset({
-      moniker: 'asset_to_be_consumed',
-      data: {
-        typeUrl: 'json',
-        value: {
-          sn: Math.random(), // To make this asset uniq every time this script runs
-          key: 'value2',
-        },
-      },
-      wallet: issuer,
-    });
-    console.log('view asset state', `${endpoint}/node/explorer/assets/${assetAddress}`);
-    console.log('view asset tx', `${endpoint}/node/explorer/txs/${hash}`);
-    await sleep(3000);
-
-    // 4. transfer asset from issuer to consumer
-    hash = await client.transfer({
-      to: consumer.toAddress(),
-      assets: [assetAddress],
-      wallet: issuer,
-    });
-    console.log('view transfer tx', `${endpoint}/node/explorer/txs/${hash}`);
-    await sleep(3000);
-    const { state } = await client.getAssetState({ address: assetAddress });
-    console.log('asset state', state);
-
-    // 5.1 issuer: encode and sign the transaction
-    const tx = await client.prepareConsumeAsset({
-      issuer: issuer.toAddress(),
-      wallet: issuer,
-    });
-
-    // 5.2 consumer: populate signatures field
-    const tx2 = await client.finalizeConsumeAsset({
-      tx,
-      wallet: consumer,
-      address: assetAddress,
-    });
-    // console.log('consumer.signed', inspect(tx2));
-
-    // 5.3 Send the consume tx
-    await sleep(3000);
-    hash = await client.consumeAsset({
-      tx: tx2,
-      wallet: consumer,
-    });
-    console.log('view consume tx', `${endpoint}/node/explorer/txs/${hash}`);
-  } catch (err) {
-    console.error(err);
-    console.log(JSON.stringify(err.errors));
-  }
-})();

package/examples/declare_forgeweb.js

@@ -1,60 +0,0 @@
-/* eslint-disable import/no-extraneous-dependencies */
-/* eslint no-console:"off" */
-
-/**
- * This script demonstrates how to declare an identity on the blockchain
- *
- * In real world, identities may belong to different entities: application, user, node, device
- *
- * Run script with: `DEBUG=@ocap/client node examples/declare_forgeweb.js`
- */
-const axios = require('axios');
-const { JWT } = require('@arcblock/did-auth');
-const { fromRandom } = require('@ocap/wallet');
-const { toBase58 } = require('@ocap/util');
-
-// const endpoint = process.env.FORGE_API_HOST || 'http://127.0.0.1:8210';
-const endpoint = process.env.FORGE_API_HOST || 'https://xenon.abtnetwork.io';
-
-axios.defaults.baseURL = endpoint;
-
-(async () => {
-  try {
-    const user = fromRandom();
-    console.log('user', user.toJSON());
-
-    const { data } = await axios.get('/didauth/declare');
-    let info = JWT.decode(data.authInfo);
-    console.log('Step1', info);
-
-    let token = JWT.sign(user.toAddress(), user.secretKey, { requestedClaims: [] });
-    let payload = {
-      userPk: toBase58(user.publicKey),
-      userInfo: token,
-    };
-
-    let result = await axios.post(info.url, payload);
-    info = JWT.decode(result.data.authInfo);
-    console.log('Step2', info);
-
-    const { requestedClaims } = info;
-    const { origin, digest } = requestedClaims[0];
-    if (toBase58(user.hash(origin)) !== digest) {
-      throw new Error('Origin and digest do not match');
-    }
-    requestedClaims[0].sig = toBase58(user.sign(origin));
-
-    token = JWT.sign(user.toAddress(), user.secretKey, { requestedClaims });
-    payload = {
-      userPk: toBase58(user.publicKey),
-      userInfo: token,
-    };
-
-    result = await axios.post(info.url, payload);
-    info = JWT.decode(result.data.authInfo);
-    console.log('Step3', info);
-  } catch (err) {
-    console.error(err);
-    console.log(JSON.stringify(err.errors));
-  }
-})();

package/examples/declare_restricted.js

@@ -1,47 +0,0 @@
-/* eslint-disable import/no-extraneous-dependencies */
-/* eslint no-console:"off" */
-
-/**
- * This script demonstrates how to declare an identity on the blockchain
- *
- * In real world, identities may belong to different entities: application, user, node, device
- *
- * Run script with: `DEBUG=@ocap/client node examples/declare.js`
- */
-const GraphqlClient = require('@ocap/client');
-const Mcrypto = require('@ocap/mcrypto');
-const { fromRandom, fromSecretKey, WalletType } = require('@ocap/wallet');
-
-const endpoint = process.env.FORGE_API_HOST || 'http://127.0.0.1:8210'; // testnet
-
-const client = new GraphqlClient(`${endpoint}/api`);
-// change this to your chain moderator sk before run the script
-const sk = '<YOUR MODERATOR SK HERE>';
-
-(async () => {
-  try {
-    const issuer = fromSecretKey(sk, WalletType({ role: Mcrypto.types.RoleType.ROLE_ACCOUNT }));
-    console.log(issuer.toJSON());
-
-    console.log('issuer', `${endpoint}/node/explorer/accounts/${issuer.toAddress()}`);
-
-    // Sign and then send: sendDeclareTx
-    const user = fromRandom();
-    const tx1 = await client.prepareDeclare({
-      issuer: issuer.toAddress(),
-      moniker: 'user',
-      wallet: user,
-    });
-    const tx2 = await client.finalizeDeclare({
-      tx: tx1,
-      wallet: issuer,
-    });
-
-    const hash = await client.sendDeclareTx({ tx: tx2, wallet: issuer });
-    console.log('user', `${endpoint}/node/explorer/accounts/${user.toAddress()}`);
-    console.log('tx', `${endpoint}/node/explorer/txs/${hash}`);
-  } catch (err) {
-    console.error(err);
-    console.log(JSON.stringify(err.errors));
-  }
-})();