diff --git a/src/main/java/org/tron/common/runtime/Runtime.java b/src/main/java/org/tron/common/runtime/Runtime.java index 4238f3af799..6afc90d4360 100644 --- a/src/main/java/org/tron/common/runtime/Runtime.java +++ b/src/main/java/org/tron/common/runtime/Runtime.java @@ -359,12 +359,6 @@ private void create() if (percent < 0 || percent > 100) { throw new ContractExeException("percent must be >= 0 and <= 100"); } - // insure one owner just have one contract - // if (this.deposit.getContractByNormalAccount(ownerAddress) != null) { - // logger.error("Trying to create second contract with one account: address: " + Wallet - // .encode58Check(ownerAddress)); - // return; - // } // insure the new contract address haven't exist if (deposit.getAccount(contractAddress) != null) { diff --git a/src/main/java/org/tron/common/runtime/vm/program/ContractState.java b/src/main/java/org/tron/common/runtime/vm/program/ContractState.java index b15aead5897..24b964fca45 100644 --- a/src/main/java/org/tron/common/runtime/vm/program/ContractState.java +++ b/src/main/java/org/tron/common/runtime/vm/program/ContractState.java @@ -70,17 +70,6 @@ public AccountCapsule getAccount(byte[] addr) { return deposit.getAccount(addr); } - @Override - public BytesCapsule getContractByNormalAccount(byte[] address) { - return deposit.getContractByNormalAccount(address); - } - - @Override - public void createContractByNormalAccountIndex(byte[] address, - BytesCapsule contractAddress) { - deposit.createContractByNormalAccountIndex(address, contractAddress); - } - @Override public void createContract(byte[] codeHash, ContractCapsule contractCapsule) { deposit.createContract(codeHash, contractCapsule); @@ -195,11 +184,6 @@ public void putContract(Key key, Value value) { deposit.putContract(key, value); } - @Override - public void putContractByNormalAccountIndex(Key key, Value value) { - deposit.putContractByNormalAccountIndex(key, value); - } - @Override public void putStorage(Key key, Storage cache) { deposit.putStorage(key, cache); diff --git a/src/main/java/org/tron/common/storage/Deposit.java b/src/main/java/org/tron/common/storage/Deposit.java index 10aae089310..57397181e53 100644 --- a/src/main/java/org/tron/common/storage/Deposit.java +++ b/src/main/java/org/tron/common/storage/Deposit.java @@ -22,8 +22,6 @@ public interface Deposit { void createContract(byte[] address, ContractCapsule contractCapsule); - void createContractByNormalAccountIndex(byte[] address, BytesCapsule contractAddress); - ContractCapsule getContract(byte[] address); void saveCode(byte[] codeHash, byte[] code); @@ -69,8 +67,6 @@ public interface Deposit { void putContract(Key key, Value value); - void putContractByNormalAccountIndex(Key key, Value value); - void putStorage(Key key, Storage cache); void putVotes(Key key, Value value); @@ -83,8 +79,6 @@ public interface Deposit { BlockCapsule getBlock(byte[] blockHash); - BytesCapsule getContractByNormalAccount(byte[] address); - long computeAfterRunStorageSize(); long getBeforeRunStorageSize(); diff --git a/src/main/java/org/tron/common/storage/DepositImpl.java b/src/main/java/org/tron/common/storage/DepositImpl.java index b00a977f52c..8f27f4a90e0 100644 --- a/src/main/java/org/tron/common/storage/DepositImpl.java +++ b/src/main/java/org/tron/common/storage/DepositImpl.java @@ -13,7 +13,6 @@ import org.tron.core.capsule.BytesCapsule; import org.tron.core.capsule.ContractCapsule; import org.tron.core.capsule.TransactionCapsule; -import org.tron.core.db.AccountContractIndexStore; import org.tron.core.db.AccountStore; import org.tron.core.db.AssetIssueStore; import org.tron.core.db.BlockStore; @@ -99,10 +98,6 @@ private AssetIssueStore getAssetIssueStore() { return dbManager.getAssetIssueStore(); } - private AccountContractIndexStore getAccountContractIndexStore() { - return dbManager.getAccountContractIndexStore(); - } - @Override public Deposit newDepositChild() { return new DepositImpl(dbManager, this, null); @@ -154,29 +149,6 @@ public synchronized AccountCapsule getAccount(byte[] address) { return accountCapsule; } - - public synchronized BytesCapsule getContractByNormalAccount(byte[] address) { - - Key key = new Key(address); - if (accountContractIndexCache.containsKey(key)) { - return accountContractIndexCache.get(key).getBytes(); - } - - BytesCapsule contract; - if (parent != null) { - contract = parent.getContractByNormalAccount(address); - } else if (prevDeposit != null) { - contract = prevDeposit.getContractByNormalAccount(address); - } else { - contract = getAccountContractIndexStore().get(address); - } - - if (contract != null) { - accountContractIndexCache.put(key, Value.create(contract.getData())); - } - return contract; - } - @Override public synchronized void createContract(byte[] address, ContractCapsule contractCapsule) { Key key = Key.create(address); @@ -184,14 +156,6 @@ public synchronized void createContract(byte[] address, ContractCapsule contract contractCache.put(key, value); } - @Override - public synchronized void createContractByNormalAccountIndex(byte[] address, - BytesCapsule contractAddress) { - Key key = new Key(address); - accountContractIndexCache - .put(key, Value.create(contractAddress.getData(), Type.VALUE_TYPE_CREATE)); - } - @Override public synchronized ContractCapsule getContract(byte[] address) { Key key = Key.create(address); @@ -430,11 +394,6 @@ public void putContract(Key key, Value value) { contractCache.put(key, value); } - @Override - public void putContractByNormalAccountIndex(Key key, Value value) { - accountContractIndexCache.put(key, value); - } - // @Override // public void putStorage(Key key, Value value) { // storageCache.put(key, value); @@ -547,18 +506,6 @@ private void commitVoteCache(Deposit deposit) { })); } - private void commitAccountContractIndex(Deposit deposit) { - accountContractIndexCache.forEach(((key, value) -> { - if (value.getType().isDirty() || value.getType().isCreate()) { - if (deposit != null) { - deposit.putContractByNormalAccountIndex(key, value); - } else { - getAccountContractIndexStore().put(key.getData(), value.getBytes()); - } - } - })); - } - @Override public void syncCacheFromAccountStore(byte[] address) { Key key = Key.create(address); diff --git a/src/main/java/org/tron/core/Wallet.java b/src/main/java/org/tron/core/Wallet.java index 36fe49a3c43..b141a2fef6a 100755 --- a/src/main/java/org/tron/core/Wallet.java +++ b/src/main/java/org/tron/core/Wallet.java @@ -340,23 +340,6 @@ public TransactionCapsule createTransactionCapsule(com.google.protobuf.Message m if (percent < 0 || percent > 100) { throw new ContractValidateException("percent must be >= 0 and <= 100"); } - -// // insure one owner just have one contract -// CreateSmartContract contract = ContractCapsule -// .getSmartContractFromTransaction(trx.getInstance()); -// byte[] ownerAddress = contract.getOwnerAddress().toByteArray(); -// if (dbManager.getAccountContractIndexStore().get(ownerAddress) != null) { -// throw new ContractValidateException( -// "Trying to create second contract with one account: address: " + Wallet -// .encode58Check(ownerAddress)); -// } - -// // insure the new contract address haven't exist -// if (deposit.getAccount(contractAddress) != null) { -// logger.error("Trying to create a contract with existing contract address: " + Wallet -// .encode58Check(contractAddress)); -// return; -// } } try { diff --git a/src/main/java/org/tron/core/capsule/TransactionInfoCapsule.java b/src/main/java/org/tron/core/capsule/TransactionInfoCapsule.java index 27073777481..4670d9067f5 100644 --- a/src/main/java/org/tron/core/capsule/TransactionInfoCapsule.java +++ b/src/main/java/org/tron/core/capsule/TransactionInfoCapsule.java @@ -131,13 +131,6 @@ public void addAllLog(List logs) { .build(); } -//todo set receipt -// public void setResult(TransactionResultCapsule result) { -// this.transactionInfo = this.transactionInfo.toBuilder() -// .setResult(result.getInstance()) -// .build(); -// } - @Override public byte[] getData() { return this.transactionInfo.toByteArray(); @@ -148,11 +141,6 @@ public TransactionInfo getInstance() { return this.transactionInfo; } - public void parseTransactionResult(TransactionResultCapsule ret) { - setUnfreezeAmount(ret.getUnfreezeAmount()); - setWithdrawAmount(ret.getWithdrawAmount()); - } - public static TransactionInfoCapsule buildInstance(TransactionCapsule trxCap, Block block, Runtime runtime, ReceiptCapsule traceReceipt) { diff --git a/src/main/java/org/tron/core/db/AccountContractIndexStore.java b/src/main/java/org/tron/core/db/AccountContractIndexStore.java deleted file mode 100644 index 044ed4bbafa..00000000000 --- a/src/main/java/org/tron/core/db/AccountContractIndexStore.java +++ /dev/null @@ -1,40 +0,0 @@ -package org.tron.core.db; - -import java.util.Objects; -import org.apache.commons.lang3.ArrayUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Component; -import org.tron.core.capsule.BytesCapsule; - -@Component -public class AccountContractIndexStore extends TronStoreWithRevoking { - - @Autowired - public AccountContractIndexStore(@Value("account-contract-index") String dbName) { - super(dbName); - } - - @Override - public BytesCapsule get(byte[] key) { - byte[] value = revokingDB.getUnchecked(key); - if (Objects.nonNull(value)) { - return new BytesCapsule(value); - } - return null; - } - - public void put(BytesCapsule normalAccountAddress, BytesCapsule contractAddress) { - super.put(normalAccountAddress.getData(), contractAddress); - } - - @Override - public boolean has(byte[] key) { - byte[] value = revokingDB.getUnchecked(key); - if (ArrayUtils.isEmpty(value)) { - return false; - } - return true; - } - -} \ No newline at end of file diff --git a/src/main/java/org/tron/core/db/Manager.java b/src/main/java/org/tron/core/db/Manager.java index 50d0499d747..80ebc999643 100644 --- a/src/main/java/org/tron/core/db/Manager.java +++ b/src/main/java/org/tron/core/db/Manager.java @@ -108,8 +108,6 @@ public class Manager { @Autowired private AccountIdIndexStore accountIdIndexStore; @Autowired - private AccountContractIndexStore accountContractIndexStore; - @Autowired private WitnessScheduleStore witnessScheduleStore; @Autowired private RecentBlockStore recentBlockStore; @@ -300,11 +298,6 @@ public void clearAndWriteNeighbours(Set nodes) { this.peersStore.put("neighbours".getBytes(), nodes); } - - public AccountContractIndexStore getAccountContractIndexStore() { - return accountContractIndexStore; - } - public Set readNeighbours() { return this.peersStore.get("neighbours".getBytes()); }