sync: sync upstream code

Signed-off-by: MiaoWoo <admin@yumc.pw>
This commit is contained in:
2019-07-16 12:22:39 +08:00
parent 32fbe503b9
commit 305d4b88da
9 changed files with 47 additions and 25 deletions

View File

@@ -1883,7 +1883,11 @@ function GetPrivKey()
var Key = sessionStorage[WALLET_KEY_NAME];
if(!Key)
Key = Storage.getItem(WALLET_KEY_NAME);
return Key;
if(Key && typeof Key === "string" && Key.length >= 64)
return Key;
else
return "";
};
function GetPubKey()
@@ -1891,7 +1895,11 @@ function GetPubKey()
var Key = sessionStorage[WALLET_PUB_KEY_NAME];
if(!Key)
Key = Storage.getItem(WALLET_PUB_KEY_NAME);
return Key;
if(Key && typeof Key === "string" && Key.length >= 64)
return Key;
else
return "";
};
function SetPrivKey(StrPrivKey)
@@ -1942,3 +1950,11 @@ function XORHash(arr1,arr2,length)
}
return arr3;
};
function Right(Str,count)
{
if(Str.length > count)
return Str.substr(Str.length - count, count);
else
return Str.substr(0, Str.length);
};