1. add one param(gasUniPrice) in utils.tx.generateRawUserTransaction …

…2.add encoding.stringToBytes && encoding.bytesToString
starcoinorg · Aug 27, 2021 · 5cd09ba · 5cd09ba
1 parent 5ec696d
commit 5cd09ba
Show file tree

Hide file tree

Showing 7 changed files with 77 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file, as of versi
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.5.2] - 2021-08-26
+- add encoding.stringToBytes && encoding.bytesToString
+
+## [1.5.1] - 2021-08-26
+- add one param(gasUniPrice) in utils.tx.generateRawUserTransaction
+
 ## [1.5.0] - 2021-08-26
 - support contract.call_v2 method in rpc actions
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@starcoin/starcoin",
-  "version": "1.5.0",
+  "version": "1.5.2",
   "description": "starcoin js sdk",
   "author": "lerencao, wk3368, tarvos21",
   "license": "Apache-2.0",

diff --git a/src/encoding/index.spec.ts b/src/encoding/index.spec.ts
@@ -3,7 +3,7 @@ import { BigNumber } from '@ethersproject/bignumber';
 import {
   addressToSCS, decodeTransactionPayload, decodeSignedUserTransaction, privateKeyToPublicKey,
   publicKeyToAuthKey, publicKeyToAddress, publicKeyToReceiptIdentifier, encodeReceiptIdentifier,
-  decodeReceiptIdentifier
+  decodeReceiptIdentifier, bytesToString, stringToBytes
 } from '.';
 import { BcsSerializer, BcsDeserializer } from '../lib/runtime/bcs';
 import { TransactionArgumentVariantU128 } from '../lib/runtime/starcoin_types';
@@ -113,7 +113,7 @@ test("encoding SignedUserTransaction hex, 0x1::DaoVoteScripts::cast_vote", async
 
   // TODO: generate maxGasAmount from contract.dry_run -> gas_used
   const maxGasAmount = 10000000
-
+  const gasUnitPrice = 1
   const chainId = 1
 
   // because the time system in dev network is relatively static, 
@@ -176,6 +176,7 @@ test("encoding SignedUserTransaction hex, 0x1::DaoVoteScripts::cast_vote", async
   //   senderAddressHex,
   //   scriptFunction,
   //   maxGasAmount,
+  //   gasUnitPrice,
   //   senderSequenceNumber,
   //   expirationTimestampSecs,
   //   chainId
@@ -207,6 +208,7 @@ test("encoding SignedUserTransaction hex, 0x1::TransferScripts::peer_to_peer", a
 
   // TODO: generate maxGasAmount from contract.dry_run -> gas_used
   const maxGasAmount = 10000000
+  const gasUnitPrice = 1
 
   const chainId = 1
 
@@ -261,6 +263,7 @@ test("encoding SignedUserTransaction hex, 0x1::TransferScripts::peer_to_peer", a
     senderAddressHex,
     scriptFunction,
     maxGasAmount,
+    gasUnitPrice,
     senderSequenceNumber,
     expirationTimestampSecs,
     chainId
@@ -380,4 +383,10 @@ test("encode struct type args: vote", () => {
   expect(structTypeTags[1]['Struct'].type_params.length).toBe(1)
 });
 
-
+test('encoe/decode string', () => {
+  const imageUrl = 'ipfs://QmSPcvcXgdtHHiVTAAarzTeubk5X3iWymPAoKBfiRFjPMY'
+  const imageBytes = stringToBytes(imageUrl)
+  const imageHex = hexlify(imageBytes)
+  expect(imageHex).toBe('0x697066733a2f2f516d5350637663586764744848695654414161727a546575626b3558336957796d50416f4b42666952466a504d59')
+  expect(bytesToString(imageBytes)).toBe(imageUrl)
+});
diff --git a/src/encoding/index.ts b/src/encoding/index.ts
@@ -356,3 +356,51 @@ export function publicKeyToReceiptIdentifier(publicKey: string): string {
 //   throw new Error(`invalid txn argument${data}`);
 //
 // }
+
+export function stringToBytes(str: string): BytesLike {
+  let bytes = new Array();
+  let len, c;
+  len = str.length;
+  for (let i = 0; i < len; i++) {
+    c = str.charCodeAt(i);
+    if (c >= 0x010000 && c <= 0x10FFFF) {
+      bytes.push(((c >> 18) & 0x07) | 0xF0);
+      bytes.push(((c >> 12) & 0x3F) | 0x80);
+      bytes.push(((c >> 6) & 0x3F) | 0x80);
+      bytes.push((c & 0x3F) | 0x80);
+    } else if (c >= 0x000800 && c <= 0x00FFFF) {
+      bytes.push(((c >> 12) & 0x0F) | 0xE0);
+      bytes.push(((c >> 6) & 0x3F) | 0x80);
+      bytes.push((c & 0x3F) | 0x80);
+    } else if (c >= 0x000080 && c <= 0x0007FF) {
+      bytes.push(((c >> 6) & 0x1F) | 0xC0);
+      bytes.push((c & 0x3F) | 0x80);
+    } else {
+      bytes.push(c & 0xFF);
+    }
+  }
+  return bytes;
+}
+
+export function bytesToString(arr: BytesLike): string {
+  if (typeof arr === 'string') {
+    return arr;
+  }
+  let str = '';
+  for (let i = 0; i < arr.length; i++) {
+    let one = arr[i].toString(2),
+      v = one.match(/^1+?(?=0)/);
+    if (v && one.length == 8) {
+      let bytesLength = v[0].length;
+      let store = arr[i].toString(2).slice(7 - bytesLength);
+      for (let st = 1; st < bytesLength; st++) {
+        store += arr[st + i].toString(2).slice(2);
+      }
+      str += String.fromCharCode(parseInt(store, 2));
+      i += bytesLength - 1;
+    } else {
+      str += String.fromCharCode(arr[i]);
+    }
+  }
+  return str;
+}
diff --git a/src/providers/jsonrpc-provider.spec.ts b/src/providers/jsonrpc-provider.spec.ts
@@ -183,7 +183,7 @@ describe('jsonrpc-provider', () => {
 
     // TODO: generate maxGasAmount from contract.dry_run -> gas_used
     let maxGasAmount = 10000000n;
-
+    const gasUnitPrice = 1;
     // because the time system in dev network is relatively static,
     // we should use nodeInfo.now_secondsinstead of using new Date().getTime()
     const nowSeconds = await provider.getNowSeconds();
@@ -216,6 +216,7 @@ describe('jsonrpc-provider', () => {
       senderAddressHex,
       scriptFunction,
       maxGasAmount,
+      gasUnitPrice,
       senderSequenceNumber,
       expirationTimestampSecs,
       chainId
@@ -237,6 +238,7 @@ describe('jsonrpc-provider', () => {
         senderAddressHex,
         scriptFunction,
         maxGasAmount,
+        gasUnitPrice,
         senderSequenceNumber,
         expirationTimestampSecs,
         chainId
@@ -277,7 +279,7 @@ describe('jsonrpc-provider', () => {
 
     // TODO: generate maxGasAmount from contract.dry_run -> gas_used
     const maxGasAmount = 10000000;
-
+    const gasUnitPrice = 1;
     // because the time system in dev network is relatively static,
     // we should use nodeInfo.now_secondsinstead of using new Date().getTime()
     const nowSeconds = await provider.getNowSeconds();
@@ -299,6 +301,7 @@ describe('jsonrpc-provider', () => {
       address,
       transactionPayload,
       maxGasAmount,
+      gasUnitPrice,
       senderSequenceNumber,
       expirationTimestampSecs,
       chainId

diff --git a/src/providers/web3-provider.ts b/src/providers/web3-provider.ts
@@ -35,7 +35,9 @@ function buildWeb3LegacyFetcher(provider: ExternalProvider, sendFunc: Web3Legacy
 
         return new Promise((resolve, reject) => {
             sendFunc(request, function (error, result) {
-                if (error) { return reject(error); }
+                if (error) {
+                    return reject(error);
+                }
 
                 if (result.error) {
                     const error = new Error(result.error.message);

diff --git a/src/utils/tx.ts b/src/utils/tx.ts
@@ -62,6 +62,7 @@ export function generateRawUserTransaction(
   senderAddress: HexString,
   payload: starcoin_types.TransactionPayload,
   maxGasAmount: U64,
+  gasUnitPrice: U64,
   senderSequenceNumber: U64,
   expirationTimestampSecs: U64,
   chainId: U8
@@ -72,7 +73,7 @@ export function generateRawUserTransaction(
   const sequence_number = BigInt(senderSequenceNumber)
 
   const max_gas_amount = BigInt(maxGasAmount)
-  const gas_unit_price = BigInt(1)
+  const gas_unit_price = BigInt(gasUnitPrice)
   const gas_token_code = '0x1::STC::STC'
   const expiration_timestamp_secs = BigInt(expirationTimestampSecs)
   const chain_id = new starcoin_types.ChainId(chainId)