Skip to content

Commit bf8de17

Browse files
xxo1shinexxo1shine
committed
Merge branch 'develop' of github.com:tronprotocol/java-tron into ww
2 parents 79e978e + a0f431c commit bf8de17

11 files changed

Lines changed: 17 additions & 59 deletions

File tree

‎common/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ dependencies {
4646
compile 'org.aspectj:aspectjrt:1.8.13'
4747
compile 'org.aspectj:aspectjweaver:1.8.13'
4848
compile 'org.aspectj:aspectjtools:1.8.13'
49-
compile group: 'io.github.tronprotocol', name: 'libp2p', version: '2.1.0',{
49+
compile group: 'com.github.tronprotocol', name: 'libp2p', version: 'test-v2.2.1',{
5050
exclude group: 'io.grpc', module: 'grpc-context'
5151
exclude group: 'io.grpc', module: 'grpc-core'
5252
exclude group: 'io.grpc', module: 'grpc-netty'

‎common/src/main/java/org/tron/common/parameter/CommonParameter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ public class CommonParameter {
176176
public int nodeListenPort;
177177
@Getter
178178
@Setter
179-
public String nodeDiscoveryBindIp;
179+
public String nodeLanIp;
180180
@Getter
181181
@Setter
182182
public String nodeExternalIp;

‎common/src/main/java/org/tron/core/Constant.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -281,8 +281,6 @@ public class Constant {
281281
public static final String EVENT_SUBSCRIBE_CONTRACT_ADDRESS = "event.subscribe.filter.contractAddress";
282282
public static final String EVENT_SUBSCRIBE_CONTRACT_TOPIC = "event.subscribe.filter.contractTopic";
283283

284-
public static final String NODE_DISCOVERY_BIND_IP = "node.discovery.bind.ip";
285-
286284
public static final String NODE_DISCOVERY_EXTERNAL_IP = "node.discovery.external.ip";
287285

288286
public static final String NODE_BACKUP_PRIORITY = "node.backup.priority";

‎framework/src/main/java/org/tron/core/config/args/Args.java‎

Lines changed: 5 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import java.io.InputStream;
2121
import java.net.InetAddress;
2222
import java.net.InetSocketAddress;
23-
import java.net.Socket;
2423
import java.text.ParseException;
2524
import java.util.ArrayList;
2625
import java.util.Arrays;
@@ -136,7 +135,7 @@ public static void clearParam() {
136135
PARAMETER.maxTps = 1000;
137136
PARAMETER.minParticipationRate = 0;
138137
PARAMETER.nodeListenPort = 0;
139-
PARAMETER.nodeDiscoveryBindIp = "";
138+
PARAMETER.nodeLanIp = "";
140139
PARAMETER.nodeExternalIp = "";
141140
PARAMETER.nodeP2pVersion = 0;
142141
PARAMETER.nodeEnableIpv6 = false;
@@ -637,7 +636,7 @@ public static void setParam(final String[] args, final String confFileName) {
637636
config.hasPath(Constant.NODE_LISTEN_PORT)
638637
? config.getInt(Constant.NODE_LISTEN_PORT) : 0;
639638

640-
bindIp(config);
639+
PARAMETER.nodeLanIp = PARAMETER.p2pConfig.getLanIp();
641640
externalIp(config);
642641

643642
PARAMETER.nodeP2pVersion =
@@ -1257,7 +1256,7 @@ public static List<InetSocketAddress> getInetSocketAddress(
12571256
if (filter) {
12581257
String ip = inetSocketAddress.getAddress().getHostAddress();
12591258
int port = inetSocketAddress.getPort();
1260-
if (!(PARAMETER.nodeDiscoveryBindIp.equals(ip)
1259+
if (!(PARAMETER.nodeLanIp.equals(ip)
12611260
|| PARAMETER.nodeExternalIp.equals(ip)
12621261
|| Constant.LOCAL_HOST.equals(ip))
12631262
|| PARAMETER.nodeListenPort != port) {
@@ -1535,33 +1534,14 @@ private static FilterQuery getEventFilter(final com.typesafe.config.Config confi
15351534
return filter;
15361535
}
15371536

1538-
private static void bindIp(final com.typesafe.config.Config config) {
1539-
if (!config.hasPath(Constant.NODE_DISCOVERY_BIND_IP)
1540-
|| config.getString(Constant.NODE_DISCOVERY_BIND_IP)
1541-
.trim().isEmpty()) {
1542-
if (PARAMETER.nodeDiscoveryBindIp == null) {
1543-
logger.info("Bind address wasn't set, Punching to identify it...");
1544-
try (Socket s = new Socket("www.baidu.com", 80)) {
1545-
PARAMETER.nodeDiscoveryBindIp = s.getLocalAddress().getHostAddress();
1546-
logger.info("UDP local bound to: {}", PARAMETER.nodeDiscoveryBindIp);
1547-
} catch (IOException e) {
1548-
logger.warn("Can't get bind IP. Fall back to 127.0.0.1: " + e);
1549-
PARAMETER.nodeDiscoveryBindIp = "127.0.0.1";
1550-
}
1551-
}
1552-
} else {
1553-
PARAMETER.nodeDiscoveryBindIp = config.getString(Constant.NODE_DISCOVERY_BIND_IP).trim();
1554-
}
1555-
}
1556-
15571537
private static void externalIp(final com.typesafe.config.Config config) {
15581538
if (!config.hasPath(Constant.NODE_DISCOVERY_EXTERNAL_IP) || config
15591539
.getString(Constant.NODE_DISCOVERY_EXTERNAL_IP).trim().isEmpty()) {
15601540
if (PARAMETER.nodeExternalIp == null) {
15611541
logger.info("External IP wasn't set, using ipv4 from libp2p");
15621542
PARAMETER.nodeExternalIp = PARAMETER.p2pConfig.getIp();
15631543
if (StringUtils.isEmpty(PARAMETER.nodeExternalIp)) {
1564-
PARAMETER.nodeExternalIp = PARAMETER.nodeDiscoveryBindIp;
1544+
PARAMETER.nodeExternalIp = PARAMETER.nodeLanIp;
15651545
}
15661546
}
15671547
} else {
@@ -1632,7 +1612,7 @@ public static void logConfig() {
16321612
logger.info("\n");
16331613
logger.info("************************ Net config ************************");
16341614
logger.info("P2P version: {}", parameter.getNodeP2pVersion());
1635-
logger.info("Bind IP: {}", parameter.getNodeDiscoveryBindIp());
1615+
logger.info("LAN IP: {}", parameter.getNodeLanIp());
16361616
logger.info("External IP: {}", parameter.getNodeExternalIp());
16371617
logger.info("Listen port: {}", parameter.getNodeListenPort());
16381618
logger.info("Node ipv6 enable: {}", parameter.isNodeEnableIpv6());

‎framework/src/test/java/org/tron/core/config/args/ArgsTest.java‎

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,6 @@
1717

1818
import com.google.common.collect.Lists;
1919
import com.typesafe.config.Config;
20-
import com.typesafe.config.ConfigMergeable;
21-
import com.typesafe.config.ConfigOrigin;
22-
import com.typesafe.config.ConfigRenderOptions;
23-
import com.typesafe.config.ConfigValue;
24-
import com.typesafe.config.ConfigValueType;
2520
import io.grpc.internal.GrpcUtil;
2621
import io.grpc.netty.NettyServerBuilder;
2722
import java.lang.reflect.InvocationTargetException;
@@ -36,10 +31,8 @@
3631
import org.tron.common.utils.ByteArray;
3732
import org.tron.common.utils.LocalWitnesses;
3833
import org.tron.common.utils.PublicMethod;
39-
import org.tron.common.utils.ReflectUtils;
4034
import org.tron.core.Constant;
4135
import org.tron.core.config.Configuration;
42-
import org.tron.core.net.peer.PeerManager;
4336

4437
@Slf4j
4538
public class ArgsTest {
@@ -95,7 +88,6 @@ public void get() {
9588

9689
Assert.assertTrue(parameter.isNodeDiscoveryEnable());
9790
Assert.assertTrue(parameter.isNodeDiscoveryPersist());
98-
Assert.assertEquals("127.0.0.1", parameter.getNodeDiscoveryBindIp());
9991
Assert.assertEquals("46.168.1.1", parameter.getNodeExternalIp());
10092
Assert.assertEquals(18888, parameter.getNodeListenPort());
10193
Assert.assertEquals(2000, parameter.getNodeConnectionTimeout());
@@ -132,27 +124,18 @@ public void testIpFromLibP2p()
132124
Args.setParam(new String[] {"-w"}, Constant.TEST_CONF);
133125
CommonParameter parameter = Args.getInstance();
134126

135-
String configuredBindIp = parameter.getNodeDiscoveryBindIp();
136127
String configuredExternalIp = parameter.getNodeExternalIp();
137-
Assert.assertEquals("127.0.0.1", configuredBindIp);
138128
Assert.assertEquals("46.168.1.1", configuredExternalIp);
139129

140130
Config config = Configuration.getByFileName(null, Constant.TEST_CONF);
141-
Config config2 = config.withoutPath(Constant.NODE_DISCOVERY_BIND_IP);
142-
Config config3 = config2.withoutPath(Constant.NODE_DISCOVERY_EXTERNAL_IP);
131+
Config config3 = config.withoutPath(Constant.NODE_DISCOVERY_EXTERNAL_IP);
143132

144-
CommonParameter.getInstance().setNodeDiscoveryBindIp(null);
145133
CommonParameter.getInstance().setNodeExternalIp(null);
146134

147-
Method method1 = Args.class.getDeclaredMethod("bindIp", Config.class);
148-
method1.setAccessible(true);
149-
method1.invoke(Args.class, config3);
150-
151135
Method method2 = Args.class.getDeclaredMethod("externalIp", Config.class);
152136
method2.setAccessible(true);
153137
method2.invoke(Args.class, config3);
154138

155-
Assert.assertNotEquals(configuredBindIp, parameter.getNodeDiscoveryBindIp());
156139
Assert.assertNotEquals(configuredExternalIp, parameter.getNodeExternalIp());
157140
}
158141
}

‎framework/src/test/java/org/tron/core/services/RpcApiServicesTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,11 +138,11 @@ public static void init() throws IOException {
138138
getInstance().setRpcPort(PublicMethod.chooseRandomPort());
139139
getInstance().setRpcOnSolidityPort(PublicMethod.chooseRandomPort());
140140
getInstance().setRpcOnPBFTPort(PublicMethod.chooseRandomPort());
141-
String fullNode = String.format("%s:%d", getInstance().getNodeDiscoveryBindIp(),
141+
String fullNode = String.format("%s:%d", getInstance().getNodeLanIp(),
142142
getInstance().getRpcPort());
143-
String solidityNode = String.format("%s:%d", getInstance().getNodeDiscoveryBindIp(),
143+
String solidityNode = String.format("%s:%d", getInstance().getNodeLanIp(),
144144
getInstance().getRpcOnSolidityPort());
145-
String pBFTNode = String.format("%s:%d", getInstance().getNodeDiscoveryBindIp(),
145+
String pBFTNode = String.format("%s:%d", getInstance().getNodeLanIp(),
146146
getInstance().getRpcOnPBFTPort());
147147

148148
ManagedChannel channelFull = ManagedChannelBuilder.forTarget(fullNode)

‎framework/src/test/java/org/tron/core/services/filter/LiteFnQueryGrpcInterceptorTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,11 @@ public static void init() throws IOException {
5858
Args.getInstance().setRpcPort(PublicMethod.chooseRandomPort());
5959
Args.getInstance().setRpcOnSolidityPort(PublicMethod.chooseRandomPort());
6060
Args.getInstance().setRpcOnPBFTPort(PublicMethod.chooseRandomPort());
61-
String fullnode = String.format("%s:%d", Args.getInstance().getNodeDiscoveryBindIp(),
61+
String fullnode = String.format("%s:%d", Args.getInstance().getNodeLanIp(),
6262
Args.getInstance().getRpcPort());
63-
String solidityNode = String.format("%s:%d", Args.getInstance().getNodeDiscoveryBindIp(),
63+
String solidityNode = String.format("%s:%d", Args.getInstance().getNodeLanIp(),
6464
Args.getInstance().getRpcOnSolidityPort());
65-
String pBFTNode = String.format("%s:%d", Args.getInstance().getNodeDiscoveryBindIp(),
65+
String pBFTNode = String.format("%s:%d", Args.getInstance().getNodeLanIp(),
6666
Args.getInstance().getRpcOnPBFTPort());
6767
channelFull = ManagedChannelBuilder.forTarget(fullnode)
6868
.usePlaintext()

‎framework/src/test/java/org/tron/core/services/filter/RpcApiAccessInterceptorTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,11 @@ public static void init() throws IOException {
5959
Args.getInstance().setRpcPort(PublicMethod.chooseRandomPort());
6060
Args.getInstance().setRpcOnSolidityPort(PublicMethod.chooseRandomPort());
6161
Args.getInstance().setRpcOnPBFTPort(PublicMethod.chooseRandomPort());
62-
String fullNode = String.format("%s:%d", Args.getInstance().getNodeDiscoveryBindIp(),
62+
String fullNode = String.format("%s:%d", Args.getInstance().getNodeLanIp(),
6363
Args.getInstance().getRpcPort());
64-
String solidityNode = String.format("%s:%d", Args.getInstance().getNodeDiscoveryBindIp(),
64+
String solidityNode = String.format("%s:%d", Args.getInstance().getNodeLanIp(),
6565
Args.getInstance().getRpcOnSolidityPort());
66-
String pBFTNode = String.format("%s:%d", Args.getInstance().getNodeDiscoveryBindIp(),
66+
String pBFTNode = String.format("%s:%d", Args.getInstance().getNodeLanIp(),
6767
Args.getInstance().getRpcOnPBFTPort());
6868

6969
ManagedChannel channelFull = ManagedChannelBuilder.forTarget(fullNode)

‎framework/src/test/resources/config-test-mainnet.conf‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ storage {
5353
node.discovery = {
5454
enable = true
5555
persist = true
56-
bind.ip = "127.0.0.1"
5756
external.ip = "46.168.1.1"
5857
}
5958

‎framework/src/test/resources/config-test-storagetest.conf‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ storage {
7676
node.discovery = {
7777
enable = true
7878
persist = true
79-
bind.ip = "127.0.0.1"
8079
external.ip = "46.168.1.1"
8180
}
8281

0 commit comments

Comments
 (0)