update to fit core v2.0 (#971)

Co-authored-by: Hank Liu <[email protected]>

Author: hankliu418

packages/coin-icx/package-lock.json

@@ -1,16 +1,18 @@
 {
   "name": "@coolwallet/icx",
-  "version": "1.1.3",
+  "version": "2.0.0-beta.0",
   "description": "CoolWallet Icon sdk",
   "main": "lib/index.js",
   "scripts": {
+    "test": "NODE_ENV=development jest --runInBand",
+    "test-lite": "NODE_ENV=development CARD=lite jest --runInBand",
+    "ci-test": "NODE_ENV=production jest --runInBand",
+    "ci-test-lite": "NODE_ENV=production CARD=lite jest --runInBand",
+    "ci-test-report": "NODE_ENV=production jest --no-bail --runInBand --reporters=default --reporters=jest-junit --testResultsProcessor=jest-junit",
     "build:types": "tsc --emitDeclarationOnly",
     "build:ts": "babel src --out-dir lib --extensions \".ts,.tsx\" --source-maps inline",
     "build": "npm run build:types && npm run build:ts",
-    "publish-single": "rm -rf node_modules && npm install && npm run build && npm publish",
-    "test": "NODE_ENV=development jest --runInBand",
-    "ci-test": "NODE_ENV=production jest --runInBand",
-    "ci-test-report": "NODE_ENV=production jest --no-bail --runInBand --reporters=default --reporters=jest-junit --testResultsProcessor=jest-junit"
+    "publish-single": "rm -rf node_modules && npm install && npm run build && npm publish"
   },
   "keywords": [
     "icx",
@@ -24,10 +26,8 @@
   ],
   "author": "coolwallet-team",
   "license": "ISC",
-  "peerDependencies": {
-    "@coolwallet/core": "^1.1.31"
-  },
   "dependencies": {
+    "@coolwallet/core": "^2.0.0-beta.20",
     "elliptic": "^6.5.1",
     "icon-sdk-js": "0.0.18",
     "js-sha3": "^0.8.0"
@@ -37,8 +37,7 @@
     "@babel/core": "^7.7.0",
     "@babel/plugin-proposal-class-properties": "^7.7.4",
     "@babel/preset-env": "^7.7.1",
-    "@babel/preset-typescript": "^7.7.7",
-    "@coolwallet/core": "^1.1.31"
+    "@babel/preset-typescript": "^7.7.7"
   },
   "repository": {
     "type": "git",

packages/coin-icx/package.json

@@ -6,8 +6,7 @@ export const TRANSFER = {
     '304502204b1911ba2d52c9fb0c87552fc47b31f25e9ae13ab4887d14d467bd3eb84baa26022100dc36343d426045e3f5f0d1223e4ed0d0eab3e6ab33a5d7bbb9de09870f478604'.padStart(
       144,
       '0'
-    )
+    ),
 };
 
-
-export const COIN_TYPE = '8000004A'
+export const COIN_TYPE = '8000004A';

packages/coin-icx/src/config/params.ts

@@ -1,7 +1,8 @@
-import { apdu, tx } from '@coolwallet/core';
+import { tx } from '@coolwallet/core';
 import * as txUtil from './utils/transactionUtil';
 import * as scriptUtil from './utils/scriptUtil';
 import * as types from './config/types';
+import { SignatureType } from '@coolwallet/core/lib/transaction/type';
 
 /**
  * Sign ICON Transaction
@@ -17,22 +18,21 @@ export default async function signTransaction(
   const { script, argument } = await scriptUtil.getScriptAndArguments(addressIndex, transaction);
 
   const sendScript = async () => {
-    await apdu.tx.sendScript(transport, script);
+    await tx.command.sendScript(transport, script);
   };
   preActions.push(sendScript);
 
   const sendArgument = async () => {
-    return await apdu.tx.executeScript(transport, appId, appPrivateKey, argument);
+    return tx.command.executeScript(transport, appId, appPrivateKey, argument);
   };
 
-  const canonicalSignature = await tx.flow.getSingleSignatureFromCoolWallet(
+  const canonicalSignature = await tx.flow.getSingleSignatureFromCoolWalletV2(
     transport,
     preActions,
     sendArgument,
-    false,
+    SignatureType.Canonical,
     confirmCB,
-    authorizedCB,
-    true
+    authorizedCB
   );
   const txObject = await txUtil.generateRawTx(canonicalSignature, transaction, publicKey);
   return txObject;

packages/coin-icx/src/sign.ts

@@ -1,7 +1,17 @@
 import { utils } from '@coolwallet/core';
-import * as params from "../config/params";
-import * as stringUtil from "./stringUtil";
+import * as params from '../config/params';
+import * as stringUtil from './stringUtil';
 
+const getTransferArgument = (transaction: any) => {
+  const tx = JSON.parse(transaction);
+  const argument =
+    stringUtil.handleHex(tx.from).slice(2) +
+    stringUtil.handleHex(tx.to).slice(2) +
+    stringUtil.handleHex(tx.value).padStart(20, '0') +
+    stringUtil.handleHex(tx.timestamp).padStart(20, '0') +
+    stringUtil.handleHex(tx.nid.toString(16)).padStart(4, '0');
+  return argument;
+};
 
 /**
  * @param {number} addressIndex
@@ -11,24 +21,11 @@ export const getScriptAndArguments = async (addressIndex: number, transaction: o
   // const addressIdxHex = "00".concat(addressIndex.toString(16).padStart(6, "0"));
   // const SEPath = `15328000002C${params.COIN_TYPE}8000000000000000${addressIdxHex}`;
   const SEPath = `15${await utils.getPath(params.COIN_TYPE, addressIndex)}`;
-  let script;
-  let argument;
-  script = params.TRANSFER.script + params.TRANSFER.signature;
-  argument = getTransferArgument(transaction);
+  const script = params.TRANSFER.script + params.TRANSFER.signature;
+  const argument = getTransferArgument(transaction);
 
   return {
     script,
     argument: SEPath + argument,
   };
 };
-
-const getTransferArgument = (transaction: any) => {
-  const tx = JSON.parse(transaction);
-  const argument =
-    stringUtil.handleHex(tx.from).slice(2) +
-    stringUtil.handleHex(tx.to).slice(2) +
-    stringUtil.handleHex(tx.value).padStart(20, "0") +
-    stringUtil.handleHex(tx.timestamp).padStart(20, "0") +
-    stringUtil.handleHex(tx.nid.toString(16)).padStart(4, "0");
-  return argument;
-};

packages/coin-icx/src/utils/scriptUtil.ts

@@ -1,5 +1,3 @@
-
-
 export const handleHex = (hex: string) => {
   const prefixRemoved = hex.slice(0, 2) === '0x' ? hex.slice(2) : hex;
   return prefixRemoved.length % 2 !== 0 ? `0${prefixRemoved}` : prefixRemoved;

packages/coin-icx/src/utils/stringUtil.ts

@@ -1,9 +1,8 @@
-import * as stringUtil from "./stringUtil";
+import * as stringUtil from './stringUtil';
 const { sha3_256 } = require('js-sha3');
 const elliptic = require('elliptic');
 const ec = new elliptic.ec('secp256k1');
 
-
 export const pubKeyToAddress = (compressedPubkey: string): string => {
   const keyPair = ec.keyFromPublic(compressedPubkey, 'hex');
   let publicKey = keyPair.getPublic(false, 'hex').substr(2);
@@ -13,7 +12,6 @@ export const pubKeyToAddress = (compressedPubkey: string): string => {
   return address;
 };
 
-
 export const generateRawTx = async (
   canonicalSignature: any,
   payload: string | object,
@@ -45,12 +43,10 @@ export function generateHashKey(obj: any): string {
   return result;
 }
 
-
 function objTraverse(obj: any) {
   let result = '';
   result += '{';
-  let keys;
-  keys = Object.keys(obj);
+  const keys = Object.keys(obj);
   keys.sort();
   for (let i = 0; i < keys.length; i++) {
     const key = keys[i];
@@ -129,11 +125,7 @@ function escapeString(value: string) {
   return newString;
 }
 
-const generateFullCanonicalSig = (
-  canonicalSignature: any,
-  phraseToSign: string,
-  compressedPubkey: string
-) => {
+const generateFullCanonicalSig = (canonicalSignature: any, phraseToSign: string, compressedPubkey: string) => {
   const keyPair = ec.keyFromPublic(compressedPubkey, 'hex');
 
   const hashcode = sha3_256.update(phraseToSign).hex();
@@ -155,4 +147,3 @@ const generateFullCanonicalSig = (
 
   return r + s + v;
 };
-