Mon Aug 19 14:00:17 CST 2019 Source Update...

This commit is contained in:
2019-08-19 14:00:17 +08:00
parent ea0bd38cae
commit 32b99633aa
26 changed files with 424 additions and 474 deletions

View File

@@ -420,10 +420,8 @@ class AccountApp extends require("./dapp")
case TYPE_TRANSACTION_ACC_HASH:
{
Result = 1
if(global.LOCAL_RUN || global.TEST_NETWORK);
else
if(BlockNum < START_BLOCK_ACCOUNT_HASH + 200000)
break;
if(BlockNum < START_BLOCK_ACCOUNT_HASH + START_BAD_ACCOUNT_CONTROL)
break;
var BlockNumHash = BlockNum - DELTA_BLOCK_ACCOUNT_HASH;
if(!this.TRCheckAccountHash(Body, BlockNum, TrNum))
{
@@ -641,6 +639,10 @@ class AccountApp extends require("./dapp")
{
CheckMinPower = 0
}
if(global.LOCAL_RUN)
{
CheckMinPower = 0
}
if(CheckMinPower && BlockNum < 19600000)
{
var MinPower;
@@ -1466,8 +1468,10 @@ class AccountApp extends require("./dapp")
var Item = TR.To[i];
var DataTo = DApps.Accounts.ReadState(Item.ID);
if(!DataTo)
{
return [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
}
for(var j = 0; j < 33; j++)
Arr[Arr.length] = DataTo.PubKey[j]
}

View File

@@ -1142,7 +1142,7 @@ function $Move(FromID,ToID,CoinSum,Description)
}
if(FromData.Value.Smart !== RunContext.Smart.Num)
{
throw "The account smart does not belong to the smart-contract, access is denied";
throw "The account: " + FromID + " does not belong to the smart-contract: " + RunContext.Smart.Num + ", access is denied";
}
if(typeof CoinSum === "number")
{
@@ -1229,7 +1229,7 @@ function $WriteState(Obj,ID)
var Smart = RunContext.Smart;
if(Account.Value.Smart !== Smart.Num)
{
throw "The account does not belong to the smart-contract, access to change state is denied";
throw "The account: " + ID + " does not belong to the smart-contract: " + Smart.Num + ", access to change state is denied";
}
Account.Value.Data = BufLib.GetBufferFromObject(Obj, Smart.StateFormat, 80, Smart.WorkStruct, 1);
DApps.Accounts.WriteStateTR(Account, RunContext.TrNum);