fix(transaction):added toShardID apply to `Harmony.types.Transaction`

packages/harmony-transaction/src/transaction.ts

@@ -43,6 +43,7 @@ class Transaction {
   private nonce: number | string;
   private to: string;
   private shardID: number | string;
+  private toShardID: number | string;
   private gasLimit: BN;
   private gasPrice: BN;
   private data: string;
@@ -69,6 +70,7 @@ class Transaction {
     this.gasPrice = params ? params.gasPrice : new BN(0);
     this.gasLimit = params ? params.gasLimit : new BN(0);
     this.shardID = params ? params.shardID : 0;
+    this.toShardID = params ? params.toShardID : 0;
 
     // this.to= params ? params.to:'0x';
     this.to = params ? this.normalizeAddress(params.to) : '0x';
@@ -173,6 +175,7 @@ class Transaction {
       from: this.txParams.from || '0x',
       to: this.txParams.to || '0x',
       shardID: this.txParams.shardID ? numberToHex(this.shardID) : '0x',
+      toShardID: this.txParams.toShardID ? numberToHex(this.toShardID) : '0x',
       gas: this.txParams.gasLimit ? numberToHex(this.txParams.gasLimit) : '0x',
       gasPrice: this.txParams.gasPrice
         ? numberToHex(this.txParams.gasPrice)
@@ -191,7 +194,7 @@ class Transaction {
       gasPrice: this.gasPrice || new BN(0),
       gasLimit: this.gasLimit || new BN(0),
       shardID: this.shardID || 0,
-      // to: this.to || '0x',
+      toShardID: this.toShardID || 0,
       to: this.normalizeAddress(this.to) || '0x',
       value: this.value || new BN(0),
       data: this.data || '0x',
@@ -208,6 +211,7 @@ class Transaction {
     this.gasPrice = params ? params.gasPrice : new BN(0);
     this.gasLimit = params ? params.gasLimit : new BN(0);
     this.shardID = params ? params.shardID : 0;
+    this.toShardID = params ? params.toShardID : 0;
     // this.to = params ? params.to : '0x';
     this.to = params ? this.normalizeAddress(params.to) : '0x';
     this.value = params ? params.value : new BN(0);

packages/harmony-transaction/src/types.ts

@@ -7,6 +7,7 @@ export interface TxParams {
   gasLimit: BN;
   gasPrice: BN;
   shardID: number | string;
+  toShardID: number | string;
   data: string;
   value: BN;
   chainId: number;

packages/harmony-transaction/src/utils.ts

@@ -25,6 +25,7 @@ export const transactionFields = [
   { name: 'gasPrice', length: 32, fix: false, transform: 'hex' },
   { name: 'gasLimit', length: 32, fix: false, transform: 'hex' },
   { name: 'shardID', length: 16, fix: false },
+  { name: 'toShardID', length: 16, fix: false },
   { name: 'to', length: 20, fix: true },
   { name: 'value', length: 32, fix: false, transform: 'hex' },
   { name: 'data', fix: false },
@@ -61,7 +62,7 @@ export const handleAddress = (value: string): string => {
 
 export const recover = (rawTransaction: string) => {
   const transaction = decode(rawTransaction);
-  if (transaction.length !== 10 && transaction.length !== 7) {
+  if (transaction.length !== 11 && transaction.length !== 8) {
     throw new Error('invalid rawTransaction');
   }
 
@@ -74,9 +75,10 @@ export const recover = (rawTransaction: string) => {
     gasPrice: new BN(strip0x(handleNumber(transaction[1]))),
     gasLimit: new BN(strip0x(handleNumber(transaction[2]))),
     shardID: new BN(strip0x(handleNumber(transaction[3]))).toNumber(),
-    to: handleAddress(transaction[4]),
-    value: new BN(strip0x(handleNumber(transaction[5]))),
-    data: transaction[6],
+    toShardID: new BN(strip0x(handleNumber(transaction[4]))).toNumber(),
+    to: handleAddress(transaction[5]),
+    value: new BN(strip0x(handleNumber(transaction[6]))),
+    data: transaction[7],
     chainId: 0,
     signature: {
       r: '',
@@ -87,19 +89,19 @@ export const recover = (rawTransaction: string) => {
   };
 
   // Legacy unsigned transaction
-  if (transaction.length === 7) {
+  if (transaction.length === 8) {
     tx.unsignedTxnHash = rawTransaction;
     return tx;
   }
 
   try {
-    tx.signature.v = new BN(strip0x(handleNumber(transaction[7]))).toNumber();
+    tx.signature.v = new BN(strip0x(handleNumber(transaction[8]))).toNumber();
   } catch (error) {
     throw error;
   }
 
-  tx.signature.r = hexZeroPad(transaction[8], 32);
-  tx.signature.s = hexZeroPad(transaction[9], 32);
+  tx.signature.r = hexZeroPad(transaction[9], 32);
+  tx.signature.s = hexZeroPad(transaction[10], 32);
 
   if (
     new BN(strip0x(handleNumber(tx.signature.r))).isZero() &&
@@ -118,7 +120,7 @@ export const recover = (rawTransaction: string) => {
 
     let recoveryParam = tx.signature.v - 27;
 
-    const raw = transaction.slice(0, 7);
+    const raw = transaction.slice(0, 8);
 
     if (tx.chainId !== 0) {
       raw.push(hexlify(tx.chainId));
@@ -159,6 +161,7 @@ export const recoverETH = (rawTransaction: string) => {
     gasPrice: new BN(strip0x(handleNumber(transaction[1]))),
     gasLimit: new BN(strip0x(handleNumber(transaction[2]))),
     shardID: 0,
+    toShardID: 0,
     to: handleAddress(transaction[3]),
     value: new BN(strip0x(handleNumber(transaction[4]))),
     data: transaction[5],