240W snapshot support

Author: YunMin

wisdom-core/src/main/java/org/wisdom/core/validate/CheckoutTransactions.java

@@ -174,6 +174,8 @@ public Result CheckCallContract(AccountState accountState, Account fromaccount,
         accountState.setAccount(fromaccount);
         AccountState contractaccountstate = getMapAccountState(tx);
         byte[] contract = contractaccountstate.getContract();
+        tx.setMethodType(tx.payload[0]);
+        tx.setContractType(tx.getContract(tx.getMethodType()));
         if (tx.getContractType() == 0) {//代币
             return ChechAssetMethod(contract, tx, contractaccountstate, accountState, publicKeyHash);
         } else if (tx.getContractType() == 1) {//多签
@@ -598,6 +600,7 @@ public Result ChechAssetMethod(byte[] contract, Transaction tx, AccountState con
 
     @Override
     public Result CheckDeployContract(AccountState accountState, Account fromaccount, Transaction tx, byte[] publicKeyHash) {
+        tx.setContractType(tx.payload[0]);
         if (tx.getContractType() == 0) {//代币
             Asset asset = Asset.getAsset(ByteUtil.bytearrayridfirst(tx.payload));
             //判断forkdb+db中是否有重复的代币合约code存在

wisdom-core/src/main/java/org/wisdom/db/AccountStateUpdater.java

@@ -141,6 +141,7 @@ public Set<byte[]> getRelatedKeys(Transaction transaction, Map<byte[], AccountSt
 
     private Set<byte[]> getTransactionPayload(Transaction tx) {
         Set<byte[]> bytes = new ByteArraySet();
+        tx.setMethodType(tx.payload[0]);
         byte[] fromhash = Address.publicKeyToHash(tx.from);
         bytes.add(fromhash);
         if (tx.getContractType() == 0) {//代币
@@ -320,6 +321,7 @@ private AccountState updateDeposit(Transaction tx, AccountState accountState, lo
 
     private AccountState updateDeployContract(Transaction tx, AccountState accountState, long height) {
         Account account = accountState.getAccount();
+        tx.setContractType(tx.payload[0]);
         switch (tx.getContractType()) {
             case 0:
                 byte[] rlpbyte = ByteUtil.bytearrayridfirst(tx.payload);
@@ -408,6 +410,7 @@ private AccountState updateDeployContract(Transaction tx, AccountState accountSt
     }
 
     private AccountState updateCallContract(Transaction tx, AccountState accountState, long height, Map<byte[], AccountState> store) {
+        tx.setMethodType(tx.payload[0]);
         Account account = accountState.getAccount();
         byte[] rlpbyte = ByteUtil.bytearrayridfirst(tx.payload);
         byte[] fromhash = Address.publicKeyToHash(tx.from);

wisdom-core/src/main/resources/application.properties

@@ -92,7 +92,7 @@ merkle-height=${MERKLE_HEIGHT:1200000}
 server.port=${SERVER_PORT:19585}
 ########################################################################################
 # 节点程序版本
-wisdom.version=v1.0.3
+wisdom.version=v1.0.4
 ########################################################################################
 # 事务的过期时间
 wisdom.ipc-config.lifetime=3600