- updated " encoding

Cryptonomic · Sep 27, 2020 · 9044b06 · 9044b06
1 parent b7d6f02
commit 9044b06
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -59,7 +59,7 @@ TBD
 <html>
 <head>
     <script src="https://cdn.jsdelivr.net/gh/cryptonomic/conseiljs/dist-web/conseiljs.min.js"
-        integrity="sha384-kPKX+a7S2j+lKDOu8UkBJz70XAbsNJykIKFr3YVTTdf7rpg/LU0wPoMBDGTLMCpn"
+        integrity="sha384-DsZ98An5RJlEquKpG7VziukP7Zqae8IlsF9VmTnz41Ga8FvAx6Hvn0hMkpBj3pms"
         crossorigin="anonymous"></script>
     <script src="https://cdn.jsdelivr.net/gh/cryptonomic/conseiljs-softsigner/dist-web/conseiljs-softsigner.min.js"
         integrity="sha384-V1iaajn0x/SMFcZ9Y/xNQmqQSKyll6Dzt27U6OWiv8NdbHTVaHOGHdQ8g0G68HPd"

diff --git a/dist-web/conseiljs.min.js b/dist-web/conseiljs.min.js
diff --git a/docs/README.md b/docs/README.md
@@ -52,7 +52,7 @@ Unlike the nodejs sample, it's not possible to configure fetch or logger referen
 <html>
 <head>
     <script src="https://cdn.jsdelivr.net/gh/cryptonomic/conseiljs/dist-web/conseiljs.min.js"
-        integrity="sha384-kPKX+a7S2j+lKDOu8UkBJz70XAbsNJykIKFr3YVTTdf7rpg/LU0wPoMBDGTLMCpn"
+        integrity="sha384-DsZ98An5RJlEquKpG7VziukP7Zqae8IlsF9VmTnz41Ga8FvAx6Hvn0hMkpBj3pms"
         crossorigin="anonymous"></script>
     <script src="https://cdn.jsdelivr.net/gh/cryptonomic/conseiljs-softsigner/dist-web/conseiljs-softsigner.min.js"
         crossorigin="anonymous"></script>
@@ -123,8 +123,8 @@ const faucetAccount = {
 
 async function initAccount() {
     const keyStore = await KeyStoreUtils.restoreIdentityFromFundraiser(faucetAccount.mnemonic.join(' '), faucetAccount.email, faucetAccount.password, faucetAccount.pkh);
-    console.log(`public key: ${keystore.publicKey}`);
-    console.log(`secret key: ${keystore.secretKey}`);
+    console.log(`public key: ${keyStore.publicKey}`);
+    console.log(`secret key: ${keyStore.secretKey}`);
 }
 
 initAccount();
@@ -146,8 +146,8 @@ const faucetAccount = {
 
 async function initAccount() {
     const keyStore = await conseiljssoftsigner.KeyStoreUtils.restoreIdentityFromFundraiser(faucetAccount.mnemonic.join(' '), faucetAccount.email, faucetAccount.password, faucetAccount.pkh);
-    console.log(`public key: ${keystore.publicKey}`);
-    console.log(`secret key: ${keystore.secretKey}`);
+    console.log(`public key: ${keyStore.publicKey}`);
+    console.log(`secret key: ${keyStore.secretKey}`);
 }
 
 initAccount();

diff --git a/grammar/tezos/Micheline.ne b/grammar/tezos/Micheline.ne
@@ -74,6 +74,7 @@ const staticStringToHex = d => {
     const prefix = '01';
     let text = d[6].toString();
     text = text.substring(1, text.length - 1); // strip double quotes
+    text = text.replace(/\\"/g, '"');
     const len = encodeLength(text.length);
 
     text = text.split('').map(c => c.charCodeAt(0).toString(16)).join('');

diff --git a/src/chain/tezos/lexer/Micheline.ts b/src/chain/tezos/lexer/Micheline.ts
@@ -63,6 +63,7 @@ const staticStringToHex = d => {
     const prefix = '01';
     let text = d[6].toString();
     text = text.substring(1, text.length - 1); // strip double quotes
+    text = text.replace(/\\"/g, '"');
     const len = encodeLength(text.length);
 
     text = text.split('').map(c => c.charCodeAt(0).toString(16)).join('');