Skip to content

Commit da519be

Browse files
jiangyy0824jiangyy0824
committed
update trigger sturcture for test
1 parent bf8ab3d commit da519be

File tree

6 files changed

+262
-183
lines changed

6 files changed

+262
-183
lines changed

‎api/src/main/java/org/tron/common/logsfilter/trigger/BlockLogTrigger.java

Lines changed: 35 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,43 @@
11
package org.tron.common.logsfilter.trigger;
22

33
import java.util.ArrayList;
4+
import java.util.List;
45
import lombok.Getter;
56
import lombok.Setter;
67

7-
import java.util.List;
8-
98
public class BlockLogTrigger extends Trigger {
10-
@Getter
11-
@Setter
12-
private long blockNumber;
13-
14-
@Getter
15-
@Setter
16-
private String blockHash;
17-
18-
@Getter
19-
@Setter
20-
private long transactionSize;
21-
22-
@Getter
23-
@Setter
24-
private List<String> transactionList = new ArrayList<>();
25-
26-
public BlockLogTrigger(){
27-
setTriggerName(Trigger.BLOCK_TRIGGER_NAME);
28-
}
29-
30-
@Override
31-
public String toString(){
32-
return new StringBuilder().append("triggerName: ").append(getTriggerName())
33-
.append("timestamp: ")
34-
.append(timeStamp)
35-
.append(", blockNumber: ")
36-
.append(blockNumber)
37-
.append(", blockhash: ")
38-
.append(blockHash)
39-
.append(", transactionSize: ")
40-
.append(transactionSize)
41-
.append(", transactionList: ")
42-
.append(transactionList).toString();
43-
}
9+
@Getter
10+
@Setter
11+
private long blockNumber;
12+
13+
@Getter
14+
@Setter
15+
private String blockHash;
16+
17+
@Getter
18+
@Setter
19+
private long transactionSize;
20+
21+
@Getter
22+
@Setter
23+
private List<String> transactionList = new ArrayList<>();
24+
25+
public BlockLogTrigger() {
26+
setTriggerName(Trigger.BLOCK_TRIGGER_NAME);
27+
}
28+
29+
@Override
30+
public String toString() {
31+
return new StringBuilder().append("triggerName: ").append(getTriggerName())
32+
.append("timestamp: ")
33+
.append(timeStamp)
34+
.append(", blockNumber: ")
35+
.append(blockNumber)
36+
.append(", blockhash: ")
37+
.append(blockHash)
38+
.append(", transactionSize: ")
39+
.append(transactionSize)
40+
.append(", transactionList: ")
41+
.append(transactionList).toString();
42+
}
4443
}

‎api/src/main/java/org/tron/common/logsfilter/trigger/ContractEventTrigger.java

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,32 +4,41 @@
44
import lombok.Getter;
55
import lombok.Setter;
66

7-
public class ContractEventTrigger extends ContractTrigger{
7+
public class ContractEventTrigger extends ContractTrigger {
8+
89
/**
910
* decode from sha3($EventSignature) with the ABI of this contract.
1011
*/
1112
@Getter
1213
@Setter
1314
private String eventSignature;
1415

16+
@Getter
17+
@Setter
18+
private String eventSignatureFull;
19+
20+
@Getter
21+
@Setter
22+
private String eventName;
23+
1524
/**
16-
* decode from topicList with the ABI of this contract.
17-
* this item is null if not called ContractEventParser::parseTopics(ContractEventTrigger trigger)
25+
* decode from topicList with the ABI of this contract. this item is null if not called
26+
* ContractEventParser::parseTopics(ContractEventTrigger trigger)
1827
*/
1928
@Getter
2029
@Setter
2130
private Map<String, String> topicMap;
2231

2332
/**
24-
* multi data items will be concat into a single string.
25-
* this item is null if not called ContractEventParser::parseData(ContractEventTrigger trigger)
33+
* multi data items will be concat into a single string. this item is null if not called
34+
* ContractEventParser::parseData(ContractEventTrigger trigger)
2635
*/
2736
@Getter
2837
@Setter
2938
private Map<String, String> dataMap;
3039

3140

32-
public ContractEventTrigger(){
41+
public ContractEventTrigger() {
3342
super();
3443
setTriggerName(Trigger.CONTRACTEVENT_TRIGGER_NAME);
3544
}

‎api/src/main/java/org/tron/common/logsfilter/trigger/ContractLogTrigger.java

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,26 @@
11
package org.tron.common.logsfilter.trigger;
22

3+
import java.util.List;
34
import lombok.Getter;
45
import lombok.Setter;
56

6-
import java.util.List;
7-
8-
public class ContractLogTrigger extends ContractTrigger{
9-
/**
10-
* topic list produced by the smart contract LOG function
11-
*/
12-
@Getter
13-
@Setter
14-
private List<String> topicList;
15-
16-
/**
17-
* data produced by the smart contract LOG function
18-
*/
19-
@Getter
20-
@Setter
21-
private String data;
7+
public class ContractLogTrigger extends ContractTrigger {
8+
/**
9+
* topic list produced by the smart contract LOG function
10+
*/
11+
@Getter
12+
@Setter
13+
private List<String> topicList;
2214

23-
public ContractLogTrigger() {
24-
super();
25-
setTriggerName(Trigger.CONTRACTLOG_TRIGGER_NAME);
26-
}
15+
/**
16+
* data produced by the smart contract LOG function
17+
*/
18+
@Getter
19+
@Setter
20+
private String data;
2721

22+
public ContractLogTrigger() {
23+
super();
24+
setTriggerName(Trigger.CONTRACTLOG_TRIGGER_NAME);
25+
}
2826
}

‎api/src/main/java/org/tron/common/logsfilter/trigger/ContractTrigger.java

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -3,54 +3,54 @@
33
import lombok.Getter;
44
import lombok.Setter;
55

6-
public class ContractTrigger extends Trigger{
7-
8-
/**
9-
* id of the transaction which produce this event.
10-
*/
11-
@Getter
12-
@Setter
13-
private String txId;
14-
15-
/**
16-
* address of the contract triggered by the callerAddress.
17-
*/
18-
@Getter
19-
@Setter
20-
private String contractAddress;
21-
22-
/**
23-
* caller of the transaction which produce this event.
24-
*/
25-
@Getter
26-
@Setter
27-
private String callerAddress;
28-
29-
/**
30-
* origin address of the contract which produce this event.
31-
*/
32-
@Getter
33-
@Setter
34-
private String originAddress;
35-
36-
/**
37-
* caller address of the contract which produce this event.
38-
*/
39-
@Getter
40-
@Setter
41-
private String creatorAddress;
42-
43-
/**
44-
* block number of the transaction
45-
*/
46-
@Getter
47-
@Setter
48-
private Long blockNum;
49-
50-
/**
51-
* true if the transaction has been revoked
52-
*/
53-
@Getter
54-
@Setter
55-
private boolean removed;
6+
public class ContractTrigger extends Trigger {
7+
8+
/**
9+
* id of the transaction which produce this event.
10+
*/
11+
@Getter
12+
@Setter
13+
private String transactionId;
14+
15+
/**
16+
* address of the contract triggered by the callerAddress.
17+
*/
18+
@Getter
19+
@Setter
20+
private String contractAddress;
21+
22+
/**
23+
* caller of the transaction which produce this event.
24+
*/
25+
@Getter
26+
@Setter
27+
private String callerAddress;
28+
29+
/**
30+
* origin address of the contract which produce this event.
31+
*/
32+
@Getter
33+
@Setter
34+
private String originAddress;
35+
36+
/**
37+
* caller address of the contract which produce this event.
38+
*/
39+
@Getter
40+
@Setter
41+
private String creatorAddress;
42+
43+
/**
44+
* block number of the transaction
45+
*/
46+
@Getter
47+
@Setter
48+
private Long blockNumber;
49+
50+
/**
51+
* true if the transaction has been revoked
52+
*/
53+
@Getter
54+
@Setter
55+
private boolean removed;
5656
}

‎api/src/main/java/org/tron/common/logsfilter/trigger/InternalTransactionPojo.java

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
package org.tron.common.logsfilter.trigger;
2+
3+
import java.util.HashMap;
4+
import java.util.Map;
5+
import lombok.Getter;
6+
import lombok.Setter;
7+
8+
public class InternalTransactionPojo {
9+
10+
@Getter
11+
@Setter
12+
private String hash;
13+
14+
@Getter
15+
@Setter
16+
/* the amount of trx to transfer (calculated as sun) */
17+
private long callValue;
18+
19+
@Getter
20+
@Setter
21+
private Map<String, Long> tokenInfo = new HashMap<>();
22+
23+
/* the address of the destination account (for message)
24+
* In creation transaction the receive address is - 0 */
25+
@Getter
26+
@Setter
27+
private String transferTo_address;
28+
29+
/* An unlimited size byte array specifying
30+
* input [data] of the message call or
31+
* Initialization code for a new contract */
32+
@Getter
33+
@Setter
34+
private String data;
35+
36+
/* Message sender address */
37+
@Getter
38+
@Setter
39+
private String caller_address;
40+
41+
@Getter
42+
@Setter
43+
private boolean rejected;
44+
45+
@Getter
46+
@Setter
47+
private String note;
48+
}

0 commit comments

Comments
 (0)