Merge pull request #95 from tronprotocol/develop

Merge from develop

Author: kuny0707

.github/workflows/codeql.yml

@@ -6,6 +6,10 @@ on:
   pull_request:
     branches: [main, develop, release_*]
 
+# Add explicit permissions - restrict to only what's needed
+permissions:
+  contents: read
+
 jobs:
   lint:
     runs-on: ubuntu-latest

.github/workflows/docker-s3-deploy.yml

@@ -9,6 +9,14 @@ on:
       aws-region:
         description: 'AWS region for the S3 bucket (e.g., ap-southeast-1)'
         required: true  # Makes the input mandatory
+      version:
+        description: 'Version of the package'
+        required: true  # Makes the input mandatory
+
+# Add explicit permissions - restrict to only what's needed
+permissions:
+  contents: read
+  id-token: write  # Needed for AWS credential provider
 
 jobs:
   build-and-sign:
@@ -50,4 +58,4 @@ jobs:
         run: |
           zip -r publish.zip tron-docker.zip tron-docker.zip.asc
           aws s3 cp publish.zip s3://${{ github.event.inputs.bucket-name }}/package/publish-latest.zip
-          aws s3 cp publish.zip s3://${{ github.event.inputs.bucket-name }}/package/publish-v0.1.1.zip
+          aws s3 cp publish.zip s3://${{ github.event.inputs.bucket-name }}/package/publish-${{github.event.inputs.version}}.zip

conf/main_net_config.conf

@@ -13,6 +13,7 @@ storage {
 
   # Otherwise, db configs will remain default and data will be stored in
   # the path of "output-directory" or which is set by "-d" ("--output-directory").
+
   # setting can impove leveldb performance .... start
   # node: if this will increase process fds,you may be check your ulimit if 'too many open files' error occurs
   # see https://github.com/tronprotocol/tips/blob/master/tip-343.md for detail
@@ -27,6 +28,7 @@ storage {
   #  maxOpenFiles = 1000
   #}
   # setting can impove leveldb performance .... end
+
   # Attention: name is a required field that must be set !!!
   properties = [
     //    {
@@ -88,12 +90,15 @@ storage {
   # the estimated number of block transactions (default 1000, min 100, max 10000).
   # so the total number of cached transactions is 65536 * txCache.estimatedTransactions
   # txCache.estimatedTransactions = 1000
+  # if true, transaction cache initialization will be faster. default false
+  # txCache.initOptimization = true
 
   # data root setting, for check data, currently, only reward-vi is used.
 
   # merkleRoot = {
   # reward-vi = 9debcb9924055500aaae98cdee10501c5c39d4daa75800a996f4bdda73dbccd8 // main-net, Sha256Hash, hexString
   # }
+
 }
 
 node.discovery = {
@@ -128,14 +133,14 @@ node.backup {
 crypto {
   engine = "eckey"
 }
-
 # prometheus metrics start
-node.metrics = {
-  prometheus{
-    enable=true
-    port="9527"
-  }
-}
+# node.metrics = {
+#  prometheus{
+#    enable=true
+#    port="9527"
+#  }
+# }
+
 # prometheus metrics end
 
 node {
@@ -156,7 +161,7 @@ node {
 
   udpNettyWorkThreadNum = 1
 
-  # Number of validate sign thread, default availableProcessors / 2
+  # Number of validate sign thread, default availableProcessors
   # validateSignThreadNum = 16
 
   maxConnections = 30
@@ -172,9 +177,10 @@ node {
   minParticipationRate = 15
 
   isOpenFullTcpDisconnect = false
+  inactiveThreshold = 600 //seconds
 
   p2p {
-    version = 11111 # 11111: Mainnet; 20180622: Nile testnet
+    version = 11111 # mainnet:11111; nile testnet:201910292
   }
 
   active = [
@@ -192,7 +198,7 @@ node {
   ]
 
   fastForward = [
-    "100.26.245.209:18888",
+    "100.27.171.62:18888",
     "15.188.6.125:18888"
   ]
 
@@ -201,11 +207,18 @@ node {
     fullNodePort = 8090
     solidityEnable = true
     solidityPort = 8091
+    PBFTEnable = true
+    PBFTPort = 8092
   }
 
   rpc {
+    enable = true
     port = 50051
-    #solidityPort = 50061
+    solidityEnable = true
+    solidityPort = 50061
+    PBFTEnable = true
+    PBFTPort = 50071
+
     # Number of gRPC thread, default availableProcessors / 2
     # thread = 16
 
@@ -257,15 +270,15 @@ node {
 
   # Dynamic loading configuration function, disabled by default
   # dynamicConfig = {
-    # enable = false
-    # Configuration file change check interval, default is 600 seconds
-    # checkInterval = 600
+  # enable = false
+  # Configuration file change check interval, default is 600 seconds
+  # checkInterval = 600
   # }
 
   dns {
     # dns urls to get nodes, url format tree://{pubkey}@{domain}, default empty
     treeUrls = [
-      #"tree://AKMQMNAJJBL73LXWPXDI4I5ZWWIZ4AWO34DWQ636QOBBXNFXH3LQS@main.trondisco.net", //offical dns tree
+      #"tree://AKMQMNAJJBL73LXWPXDI4I5ZWWIZ4AWO34DWQ636QOBBXNFXH3LQS@main.trondisco.net",
     ]
 
     # enable or disable dns publish, default false
@@ -331,6 +344,14 @@ node {
     # httpSolidityPort = 8555
     # httpPBFTEnable = true
     # httpPBFTPort = 8565
+
+    # The maximum blocks range to retrieve logs for eth_getLogs, default value is 5000,
+    # should be > 0, otherwise means no limit.
+    maxBlockRange = 5000
+
+    # The maximum number of allowed topics within a topic criteria, default value is 1000,
+    # should be > 0, otherwise means no limit.
+    maxSubTopics = 1000
   }
 
   # Disabled api list, it will work for http, rpc and pbft, both fullnode and soliditynode,
@@ -341,6 +362,7 @@ node {
   #   "getaccount",
   #   "getnowblock2"
   # ]
+
 }
 
 ## rate limiter config
@@ -633,7 +655,7 @@ block = {
   proposalExpireTime = 259200000 // 3 day: 259200000(ms)
 }
 
-# Transaction reference block, default is "solid", configure to "head" may incur TaPos error
+# Transaction reference block, default is "solid", configure to "head" may cause TaPos error
 # trx.reference.block = "solid" // head;solid;
 
 # This property sets the number of milliseconds after the creation of the transaction that is expired, default value is  60000.
@@ -649,6 +671,10 @@ vm = {
   # Indicates whether the node stores featured internal transactions, such as freeze, vote and so on
   # saveFeaturedInternalTx = false
 
+  # Indicates whether the node stores the details of the internal transactions generated by the
+  # CANCELALLUNFREEZEV2 opcode, such as bandwidth/energy/tronpower cancel amount.
+  # saveCancelAllUnfreezeV2Details = false
+
   # In rare cases, transactions that will be within the specified maximum execution time (default 10(ms)) are re-executed and packaged
   # longRunningTime = 10
 
@@ -660,77 +686,81 @@ vm = {
 }
 
 committee = {
-  allowCreationOfContracts = 0  //Mainnet:0 (reset by committee),test:1
-  allowAdaptiveEnergy = 0  //Mainnet:0 (reset by committee),test:1
+  allowCreationOfContracts = 0  //mainnet:0 (reset by committee),test:1
+  allowAdaptiveEnergy = 0  //mainnet:0 (reset by committee),test:1
 }
 
 event.subscribe = {
-    native = {
-      useNativeQueue = true // if true, use native message queue, else use event plugin.
-      bindport = 5555 // bind port
-      sendqueuelength = 1000 //max length of send queue
+  native = {
+    useNativeQueue = true // if true, use native message queue, else use event plugin.
+    bindport = 5555 // bind port
+    sendqueuelength = 1000 //max length of send queue
+  }
+  version = 0
+  # Specify the starting block number to sync historical events. This is only applicable when version = 1.
+  # After performing a full event sync, set this value to 0 or a negative number.
+  # startSyncBlockNum = 1
+
+  path = "" // absolute path of plugin
+  server = "" // target server address to receive event triggers
+  // dbname|username|password, if you want to create indexes for collections when the collections
+  // are not exist, you can add version and set it to 2, as dbname|username|password|version
+  // if you use version 2 and one collection not exists, it will create index automaticaly;
+  // if you use version 2 and one collection exists, it will not create index, you must create index manually;
+  dbconfig = ""
+  contractParse = true
+  topics = [
+    {
+      triggerName = "block" // block trigger, the value can't be modified
+      enable = false
+      topic = "block" // plugin topic, the value could be modified
+      solidified = false // if set true, just need solidified block, default is false
+    },
+    {
+      triggerName = "transaction"
+      enable = false
+      topic = "transaction"
+      solidified = false
+      ethCompatible = false // if set true, add transactionIndex, cumulativeEnergyUsed, preCumulativeLogCount, logList, energyUnitPrice, default is false
+    },
+    {
+      triggerName = "contractevent"
+      enable = false
+      topic = "contractevent"
+    },
+    {
+      triggerName = "contractlog"
+      enable = false
+      topic = "contractlog"
+      redundancy = false // if set true, contractevent will also be regarded as contractlog
+    },
+    {
+      triggerName = "solidity" // solidity block trigger(just include solidity block number and timestamp), the value can't be modified
+      enable = true            // the default value is true
+      topic = "solidity"
+    },
+    {
+      triggerName = "solidityevent"
+      enable = false
+      topic = "solidityevent"
+    },
+    {
+      triggerName = "soliditylog"
+      enable = false
+      topic = "soliditylog"
+      redundancy = false // if set true, solidityevent will also be regarded as soliditylog
     }
+  ]
 
-    path = "" // absolute path of plugin
-    server = "" // target server address to receive event triggers
-    // dbname|username|password, if you want to create indexes for collections when the collections
-    // are not exist, you can add version and set it to 2, as dbname|username|password|version
-    // if you use version 2 and one collection not exists, it will create index automaticaly;
-    // if you use version 2 and one collection exists, it will not create index, you must create index manually;
-    dbconfig = ""
-    contractParse = true
-    topics = [
-        {
-          triggerName = "block" // block trigger, the value can't be modified
-          enable = false
-          topic = "block" // plugin topic, the value could be modified
-          solidified = false // if set true, just need solidified block, default is false
-        },
-        {
-          triggerName = "transaction"
-          enable = false
-          topic = "transaction"
-          solidified = false
-          ethCompatible = false // if set true, add transactionIndex, cumulativeEnergyUsed, preCumulativeLogCount, logList, energyUnitPrice, default is false
-        },
-        {
-          triggerName = "contractevent"
-          enable = false
-          topic = "contractevent"
-        },
-        {
-          triggerName = "contractlog"
-          enable = false
-          topic = "contractlog"
-          redundancy = false // if set true, contractevent will also be regarded as contractlog
-        },
-        {
-          triggerName = "solidity" // solidity block trigger(just include solidity block number and timestamp), the value can't be modified
-          enable = true            // the default value is true
-          topic = "solidity"
-        },
-        {
-          triggerName = "solidityevent"
-          enable = false
-          topic = "solidityevent"
-        },
-        {
-          triggerName = "soliditylog"
-          enable = false
-          topic = "soliditylog"
-          redundancy = false // if set true, solidityevent will also be regarded as soliditylog
-        }
+  filter = {
+    fromblock = "" // the value could be "", "earliest" or a specified block number as the beginning of the queried range
+    toblock = "" // the value could be "", "latest" or a specified block number as end of the queried range
+    contractAddress = [
+      "" // contract address you want to subscribe, if it's set to "", you will receive contract logs/events with any contract address.
     ]
 
-    filter = {
-       fromblock = "" // the value could be "", "earliest" or a specified block number as the beginning of the queried range
-       toblock = "" // the value could be "", "latest" or a specified block number as end of the queried range
-       contractAddress = [
-           "" // contract address you want to subscribe, if it's set to "", you will receive contract logs/events with any contract address.
-       ]
-
-       contractTopic = [
-           "" // contract topic you want to subscribe, if it's set to "", you will receive contract logs/events with any contract topic.
-       ]
-    }
+    contractTopic = [
+      "" // contract topic you want to subscribe, if it's set to "", you will receive contract logs/events with any contract topic.
+    ]
+  }
 }

conf/private_net_config_others.conf

@@ -51,7 +51,7 @@ storage {
 
 # this part of config is used to node discovery.
 node.discovery = {
-  enable = true  # you should set this entry value with true if you want your node can be discovered by other node.
+  enable = true  # you should set this entry value with true if you want to discover other nodes or be discovered by other nodes.
   persist = true  # this entry is used to determined to whether storing the peers in the database or not.
 }
 
@@ -96,7 +96,7 @@ node {
   isOpenFullTcpDisconnect = true
 
   p2p {
-    version = 1 # 11111: Mainnet; 20180622: Nile testnet; you can set other number when you deploy one private net, but the node must have the same number in some private net.
+    version = 1 # mainnet:11111; nile testnet:201910292; other net: customized, should not be equal to 11111 or 201910292.
   }
 
   active = [

conf/private_net_config_witness1.conf

@@ -51,7 +51,7 @@ storage {
 
 # this part of config is used to node discovery.
 node.discovery = {
-  enable = true  # you should set this entry value with true if you want your node can be discovered by other node.
+  enable = true  # you should set this entry value with true if you want to discover other nodes or be discovered by other nodes.
   persist = true  # this entry is used to determined to whether storing the peers in the database or not.
 }
 
@@ -96,7 +96,7 @@ node {
   isOpenFullTcpDisconnect = true
 
   p2p {
-    version = 1 # 11111: Mainnet; 20180622: Nile testnet; you can set other number when you deploy one private net, but the node must have the same number in some private net.
+    version = 1 # mainnet:11111; nile testnet:201910292; other net: customized, should not be equal to 11111 or 201910292.
   }
 
   active = [