Skip to content

Commit 52eb6b0

Browse files
lvs007lvs007
authored
Merge pull request #542 from tronprotocol/release_v4.7.0
Release v4.7.0
2 parents cd701ad + df7e56d commit 52eb6b0

File tree

12 files changed

+1821
-150
lines changed

12 files changed

+1821
-150
lines changed

‎README.md‎

Lines changed: 349 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,10 @@ For more information on a specific command, just type the command on terminal wh
9595
| [ShowShieldedTRC20AddressInfo](#How-to-transfer-shielded-TRC20-token) | [TransferAsset](#How-to-issue-TRC10-tokens) | [TriggerContract](#How-to-use-smart-contracts) |
9696
| [UnfreezeAsset](#How-to-issue-TRC10-tokens) | [UnfreezeBalance](#How-to-delegate-resource) |[UpdateAsset](#How-to-issue-TRC10-tokens) |
9797
| [UpdateBrokerage](#Brokerage) | [UpdateEnergyLimit](#How-to-use-smart-contracts) |[UpdateSetting](#How-to-use-smart-contracts) |
98-
| [UpdateAccountPermission](#How-to-use-the-multi-signature-feature-of-wallet-cli) | [VoteWitness](#How-to-vote) |
98+
| [UpdateAccountPermission](#How-to-use-the-multi-signature-feature-of-wallet-cli) | [VoteWitness](#How-to-vote) | [FreezeBalanceV2](#How-to-freezev2) |
99+
| [UnfreezeBalanceV2](#How-to-freezev2) | [DelegateResource](#How-to-freezev2) | [UnDelegateResource](#How-to-freezev2) |
100+
| [WithdrawExpireUnfreeze](#How-to-freezev2) | [GetDelegatedResourceV2](#How-to-freezev2) | [GetDelegatedResourceAccountIndexV2](#How-to-freezev2) |
101+
| [GetCanDelegatedMaxSize](#How-to-freezev2) | [GetAvailableUnfreezeCount](#How-to-freezev2) | [GetCanWithdrawUnfreezeAmount](#How-to-freezev2) |
99102

100103
Type any one of the listed commands, to display how-to tips.
101104

@@ -1087,6 +1090,351 @@ getDelegatedResource fromAddress toAddress
10871090
getDelegatedResourceAccountIndex address
10881091
> get the information that address is delegated to other account resources
10891092
1093+
1094+
## How to freezev2
1095+
1096+
### freezev2/unfreezev2 resource
1097+
1098+
> freezeBalanceV2 [OwnerAddress] frozen_balance [ResourceCode:0 BANDWIDTH,1 ENERGY,2 TRON_POWER]
1099+
1100+
OwnerAddress
1101+
> The address of the account that initiated the transaction, optional, default is the address of the login account.
1102+
1103+
frozen_balance
1104+
> The amount of frozen, the unit is the smallest unit (Sun), the minimum is 1000000sun.
1105+
1106+
ResourceCode
1107+
> 0 BANDWIDTH;1 ENERGY
1108+
1109+
Example:
1110+
```console
1111+
wallet> FreezeBalanceV2 TJAVcszse667FmSNCwU2fm6DmfM5D4AyDh 1000000000000000 0
1112+
txid is 82244829971b4235d98a9f09ba67ddb09690ac2f879ad93e09ba3ec1ab29177d
1113+
wallet> GetTransactionById 82244829971b4235d98a9f09ba67ddb09690ac2f879ad93e09ba3ec1ab29177d
1114+
{
1115+
"ret":[
1116+
{
1117+
"contractRet":"SUCCESS"
1118+
}
1119+
],
1120+
"signature":[
1121+
"4faa3772fa3d3e4792e8126cafed2dc2c5c069cd09c29532f0119bc982bf356004772e16fad86e401f5818c35b96d214d693efab06997ca2f07044d4494f12fd01"
1122+
],
1123+
"txID":"82244829971b4235d98a9f09ba67ddb09690ac2f879ad93e09ba3ec1ab29177d",
1124+
"raw_data":{
1125+
"contract":[
1126+
{
1127+
"parameter":{
1128+
"value":{
1129+
"frozen_balance":1000000000000000,
1130+
"owner_address":"4159e3741a68ec3e1ebba80ad809d5ccd31674236e"
1131+
},
1132+
"type_url":"type.googleapis.com/protocol.FreezeBalanceV2Contract"
1133+
},
1134+
"type":"FreezeBalanceV2Contract"
1135+
}
1136+
],
1137+
"ref_block_bytes":"0000",
1138+
"ref_block_hash":"19b59068c6058ff4",
1139+
"expiration":1671109891800,
1140+
"timestamp":1671088291796
1141+
},
1142+
"raw_data_hex":"0a020000220819b59068c6058ff440d8ada5afd1305a5c083612580a34747970652e676f6f676c65617069732e636f6d2f70726f746f636f6c2e467265657a6542616c616e63655632436f6e747261637412200a154159e3741a68ec3e1ebba80ad809d5ccd31674236e1080809aa6eaafe30170d4fffea4d130"
1143+
}
1144+
```
1145+
1146+
> unfreezeBalanceV2 [OwnerAddress] unfreezeBalance ResourceCode(0 BANDWIDTH,1 ENERGY,2 TRON_POWER)
1147+
1148+
OwnerAddress
1149+
> The address of the account that initiated the transaction, optional, default is the address of the login account.
1150+
1151+
unfreezeBalance
1152+
> The amount of unfreeze, the unit is the smallest unit (Sun)
1153+
1154+
ResourceCode
1155+
> 0 BANDWIDTH;1 ENERGY
1156+
1157+
Example:
1158+
```console
1159+
wallet> UnFreezeBalanceV2 TJAVcszse667FmSNCwU2fm6DmfM5D4AyDh 9000000 0
1160+
txid is dcfea1d92fc928d24c88f7f71a03ae8105d0b5b112d6d48be93d3b9c73bea634
1161+
wallet> GetTransactionById dcfea1d92fc928d24c88f7f71a03ae8105d0b5b112d6d48be93d3b9c73bea634
1162+
{
1163+
"ret":[
1164+
{
1165+
"contractRet":"SUCCESS"
1166+
}
1167+
],
1168+
"signature":[
1169+
"f73a278f742c11e8e5ede693ca09b0447a804fcb28ea2bfdfd8545bb05da7be44bd08cfaa92bd4d159178f763fcf753f28d5296bd0c3d4557532cce3b256b9da00"
1170+
],
1171+
"txID":"dcfea1d92fc928d24c88f7f71a03ae8105d0b5b112d6d48be93d3b9c73bea634",
1172+
"raw_data":{
1173+
"contract":[
1174+
{
1175+
"parameter":{
1176+
"value":{
1177+
"owner_address":"4159e3741a68ec3e1ebba80ad809d5ccd31674236e",
1178+
"unfreeze_balance":9000000
1179+
},
1180+
"type_url":"type.googleapis.com/protocol.UnfreezeBalanceV2Contract"
1181+
},
1182+
"type":"UnfreezeBalanceV2Contract"
1183+
}
1184+
],
1185+
"ref_block_bytes":"0000",
1186+
"ref_block_hash":"19b59068c6058ff4",
1187+
"expiration":1671119916913,
1188+
"timestamp":1671098316907
1189+
},
1190+
"raw_data_hex":"0a020000220819b59068c6058ff440f19e89b4d1305a5a083712560a36747970652e676f6f676c65617069732e636f6d2f70726f746f636f6c2e556e667265657a6542616c616e63655632436f6e7472616374121c0a154159e3741a68ec3e1ebba80ad809d5ccd31674236e10c0a8a50470ebf0e2a9d130"
1191+
}
1192+
```
1193+
1194+
### delegate/undelegate resource
1195+
1196+
> delegateResource [OwnerAddress] balance ResourceCode(0 BANDWIDTH,1 ENERGY), ReceiverAddress [lock]
1197+
1198+
OwnerAddress
1199+
> The address of the account that initiated the transaction, optional, default is the address of the login account.
1200+
1201+
balance
1202+
> The amount of delegate, the unit is the smallest unit (Sun), the minimum is 1000000sun.
1203+
1204+
ResourceCode
1205+
> 0 BANDWIDTH;1 ENERGY
1206+
1207+
ReceiverAddress
1208+
> The address of the account
1209+
1210+
lock
1211+
> default is false, set true if need lock delegate for 3 days
1212+
1213+
Example:
1214+
```console
1215+
wallet> DelegateResource TJAVcszse667FmSNCwU2fm6DmfM5D4AyDh 10000000 0 TQ4gjjpAjLNnE67UFbmK5wVt5fzLfyEVs3 true
1216+
txid is 363ac0b82b6ad3e0d3cad90f7d72b3eceafe36585432a3e013389db36152b6ed
1217+
wallet> GetTransactionById 363ac0b82b6ad3e0d3cad90f7d72b3eceafe36585432a3e013389db36152b6ed
1218+
{
1219+
"ret":[
1220+
{
1221+
"contractRet":"SUCCESS"
1222+
}
1223+
],
1224+
"signature":[
1225+
"1f57fd78456136faadc5091b47f5fd27a8e1181621e49129df6a4062499429fb48ee72e5f9a9ff5bfb7f2575f01f4076f7d4b89ca382d36af46a6fa4bc749f4301"
1226+
],
1227+
"txID":"363ac0b82b6ad3e0d3cad90f7d72b3eceafe36585432a3e013389db36152b6ed",
1228+
"raw_data":{
1229+
"contract":[
1230+
{
1231+
"parameter":{
1232+
"value":{
1233+
"balance":10000000,
1234+
"receiver_address":"419a9afe56e155ef0ff3f680d00ecf19deff60bdca",
1235+
"lock":true,
1236+
"owner_address":"4159e3741a68ec3e1ebba80ad809d5ccd31674236e"
1237+
},
1238+
"type_url":"type.googleapis.com/protocol.DelegateResourceContract"
1239+
},
1240+
"type":"DelegateResourceContract"
1241+
}
1242+
],
1243+
"ref_block_bytes":"0000",
1244+
"ref_block_hash":"19b59068c6058ff4",
1245+
"expiration":1671120059226,
1246+
"timestamp":1671098459216
1247+
},
1248+
"raw_data_hex":"0a020000220819b59068c6058ff440daf691b4d1305a720839126e0a35747970652e676f6f676c65617069732e636f6d2f70726f746f636f6c2e44656c65676174655265736f75726365436f6e747261637412350a154159e3741a68ec3e1ebba80ad809d5ccd31674236e1880ade2042215419a9afe56e155ef0ff3f680d00ecf19deff60bdca280170d0c8eba9d130"
1249+
}
1250+
1251+
```
1252+
1253+
> unDelegateResource [OwnerAddress] balance ResourceCode(0 BANDWIDTH,1 ENERGY), ReceiverAddress
1254+
1255+
OwnerAddress
1256+
> The address of the account that initiated the transaction, optional, default is the address of the login account.
1257+
1258+
balance
1259+
> The amount of unDelegate, the unit is the smallest unit (Sun)
1260+
1261+
ResourceCode
1262+
> 0 BANDWIDTH;1 ENERGY
1263+
1264+
ReceiverAddress
1265+
> The address of the account
1266+
1267+
Example:
1268+
```console
1269+
wallet> UnDelegateResource TJAVcszse667FmSNCwU2fm6DmfM5D4AyDh 1000000 0 TQ4gjjpAjLNnE67UFbmK5wVt5fzLfyEVs3
1270+
txid is feb334794cf361fd351728026ccf7319e6ae90eba622b9eb53c626cdcae4965c
1271+
wallet> GetTransactionById feb334794cf361fd351728026ccf7319e6ae90eba622b9eb53c626cdcae4965c
1272+
{
1273+
"ret":[
1274+
{
1275+
"contractRet":"SUCCESS"
1276+
}
1277+
],
1278+
"signature":[
1279+
"85a41a4e44780ffbe0841a44fd71cf621f129d98e84984cfca68e03364f781aa7f9d44177af0b40d82da052feec9f47a399ed6e51be66c5db07cb13477dcde8c01"
1280+
],
1281+
"txID":"feb334794cf361fd351728026ccf7319e6ae90eba622b9eb53c626cdcae4965c",
1282+
"raw_data":{
1283+
"contract":[
1284+
{
1285+
"parameter":{
1286+
"value":{
1287+
"balance":1000000,
1288+
"receiver_address":"419a9afe56e155ef0ff3f680d00ecf19deff60bdca",
1289+
"owner_address":"4159e3741a68ec3e1ebba80ad809d5ccd31674236e"
1290+
},
1291+
"type_url":"type.googleapis.com/protocol.UnDelegateResourceContract"
1292+
},
1293+
"type":"UnDelegateResourceContract"
1294+
}
1295+
],
1296+
"ref_block_bytes":"0000",
1297+
"ref_block_hash":"19b59068c6058ff4",
1298+
"expiration":1671120342283,
1299+
"timestamp":1671098742280
1300+
},
1301+
"raw_data_hex":"0a020000220819b59068c6058ff4408b9aa3b4d1305a71083a126d0a37747970652e676f6f676c65617069732e636f6d2f70726f746f636f6c2e556e44656c65676174655265736f75726365436f6e747261637412320a154159e3741a68ec3e1ebba80ad809d5ccd31674236e18c0843d2215419a9afe56e155ef0ff3f680d00ecf19deff60bdca7088ecfca9d130"
1302+
}
1303+
```
1304+
1305+
> withdrawExpireUnfreeze [OwnerAddress]
1306+
1307+
OwnerAddress
1308+
> The address of the account that initiated the transaction, optional, default is the address of the login account.
1309+
1310+
Example:
1311+
```console
1312+
wallet> withdrawexpireunfreeze TJAVcszse667FmSNCwU2fm6DmfM5D4AyDh
1313+
txid is e5763ab8dfb1e7ed076770d55cf3c1ddaf36d75e23ec8330f99df7e98f54a147
1314+
wallet> GetTransactionById e5763ab8dfb1e7ed076770d55cf3c1ddaf36d75e23ec8330f99df7e98f54a147
1315+
{
1316+
"ret":[
1317+
{
1318+
"contractRet":"SUCCESS"
1319+
}
1320+
],
1321+
"signature":[
1322+
"f8f02b5aa634b8666862a6d2ed68fcfd90afc616d14062952b0b09f0404d9bca6c4d3dc6dab082784950ff1ded235a07dab0d738c8a202be9451d5ca92b8eece01"
1323+
],
1324+
"txID":"e5763ab8dfb1e7ed076770d55cf3c1ddaf36d75e23ec8330f99df7e98f54a147",
1325+
"raw_data":{
1326+
"contract":[
1327+
{
1328+
"parameter":{
1329+
"value":{
1330+
"owner_address":"4159e3741a68ec3e1ebba80ad809d5ccd31674236e"
1331+
},
1332+
"type_url":"type.googleapis.com/protocol.WithdrawExpireUnfreezeContract"
1333+
},
1334+
"type":"WithdrawExpireUnfreezeContract"
1335+
}
1336+
],
1337+
"ref_block_bytes":"0000",
1338+
"ref_block_hash":"19b59068c6058ff4",
1339+
"expiration":1671122055318,
1340+
"timestamp":1671100455315
1341+
},
1342+
"raw_data_hex":"0a020000220819b59068c6058ff44096e18bb5d1305a5a083812560a3b747970652e676f6f676c65617069732e636f6d2f70726f746f636f6c2e5769746864726177457870697265556e667265657a65436f6e747261637412170a154159e3741a68ec3e1ebba80ad809d5ccd31674236e7093b3e5aad130"
1343+
}
1344+
```
1345+
1346+
### get resource delegation information use v2 API
1347+
1348+
> getDelegatedResourceV2 fromAddress toAddress
1349+
> get the information from the fromAddress to the toAddress resource delegate use v2 API
1350+
1351+
fromAddress
1352+
> The address of the account that start the delegate
1353+
1354+
toAddress
1355+
> The address of the account that receive the delegate
1356+
1357+
Example:
1358+
```console
1359+
wallet> getDelegatedResourceV2 TJAVcszse667FmSNCwU2fm6DmfM5D4AyDh TQ4gjjpAjLNnE67UFbmK5wVt5fzLfyEVs3
1360+
{
1361+
"delegatedResource": [
1362+
{
1363+
"from": "TJAVcszse667FmSNCwU2fm6DmfM5D4AyDh",
1364+
"to": "TQ4gjjpAjLNnE67UFbmK5wVt5fzLfyEVs3",
1365+
"frozen_balance_for_bandwidth": 10000000
1366+
}
1367+
]
1368+
}
1369+
```
1370+
1371+
> getDelegatedResourceAccountIndexV2 address
1372+
> get the information that address is delegated to other account resources use v2 API
1373+
1374+
address
1375+
> The address of the account that start the delegate or receive the delegate
1376+
1377+
Example:
1378+
```console
1379+
wallet> getDelegatedResourceAccountIndexV2 TJAVcszse667FmSNCwU2fm6DmfM5D4AyDh
1380+
{
1381+
"account": "TJAVcszse667FmSNCwU2fm6DmfM5D4AyDh",
1382+
"toAccounts": [
1383+
"TQ4gjjpAjLNnE67UFbmK5wVt5fzLfyEVs3"
1384+
]
1385+
}
1386+
```
1387+
1388+
> getcandelegatedmaxsize ownerAddress type
1389+
> get the max size that the ownerAddress can delegate use delegateResource
1390+
1391+
ownerAddress
1392+
> The address of the account that start the delegate, optional, default is the address of the login account.
1393+
1394+
type
1395+
> 0 bandwidth, 1 energy
1396+
1397+
Example:
1398+
```console
1399+
wallet> getCanDelegatedMaxSize TJAVcszse667FmSNCwU2fm6DmfM5D4AyDh 0
1400+
{
1401+
"max_size": 999999978708334
1402+
}
1403+
```
1404+
1405+
> getavailableunfreezecount ownerAddress
1406+
> get the available unfreeze count that the ownerAddress can call unfreezeBalanceV2
1407+
1408+
ownerAddress
1409+
> The address of the account that initiated the transaction, optional, default is the address of the login account.
1410+
1411+
Example:
1412+
```console
1413+
wallet> getAvailableUnfreezeCount TJAVcszse667FmSNCwU2fm6DmfM5D4AyDh
1414+
{
1415+
"count": 31
1416+
}
1417+
```
1418+
1419+
> getcanwithdrawunfreezeamount ownerAddress timestamp
1420+
> get the withdraw unfreeze amount that the ownerAddress can get by withdrawexpireunfreeze
1421+
1422+
ownerAddress
1423+
> The address of the account that initiated the transaction, optional, default is the address of the login account.
1424+
1425+
timestamp
1426+
> get can withdraw unfreeze amount until timestamp,
1427+
1428+
1429+
Example:
1430+
```console
1431+
wallet> getCanWithdrawUnfreezeAmount TJAVcszse667FmSNCwU2fm6DmfM5D4AyDh 1671100335000
1432+
{
1433+
"amount": 9000000
1434+
}
1435+
```
1436+
1437+
10901438
## Wallet related commands
10911439

10921440
**RegisterWallet**

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ dependencies {
8989
compile group: 'org.projectlombok', name: 'lombok', version: '1.18.2'
9090

9191
compile group: 'org.jline', name: 'jline', version: '3.15.0'
92-
compile 'com.github.tronprotocol:zksnark-java-sdk:master-SNAPSHOT'
92+
compile 'io.github.tronprotocol:zksnark-java-sdk:1.0.0'
9393
}
9494

9595
protobuf {

‎src/main/java/org/tron/common/utils/HttpSelfFormatFieldName.java‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,22 @@ public class HttpSelfFormatFieldName {
115115
AddressFieldNameMap.put("protocol.ShieldedTransferContract.transparent_from_address", 1);
116116
AddressFieldNameMap.put("protocol.ShieldedTransferContract.transparent_to_address", 1);
117117

118+
//FreezeBalanceV2Contract
119+
AddressFieldNameMap.put("protocol.FreezeBalanceV2Contract.owner_address", 1);
120+
//UnfreezeBalanceV2Contract
121+
AddressFieldNameMap.put("protocol.UnfreezeBalanceV2Contract.owner_address", 1);
122+
//WithdrawExpireUnfreezeContract
123+
AddressFieldNameMap.put("protocol.WithdrawExpireUnfreezeContract.owner_address", 1);
124+
//DelegateResourceContract
125+
AddressFieldNameMap.put("protocol.DelegateResourceContract.owner_address", 1);
126+
AddressFieldNameMap.put("protocol.DelegateResourceContract.receiver_address", 1);
127+
//UnDelegateResourceContract
128+
AddressFieldNameMap.put("protocol.UnDelegateResourceContract.owner_address", 1);
129+
AddressFieldNameMap.put("protocol.UnDelegateResourceContract.receiver_address", 1);
130+
AddressFieldNameMap.put("protocol.CanDelegatedMaxSizeRequestMessage.owner_address", 1);
131+
AddressFieldNameMap.put("protocol.GetAvailableUnfreezeCountRequestMessage.owner_address", 1);
132+
AddressFieldNameMap.put("protocol.CanWithdrawUnfreezeAmountRequestMessage.owner_address", 1);
133+
118134
//***** Tron.proto *****
119135
//AccountId
120136
AddressFieldNameMap.put("protocol.AccountId.address", 1);

0 commit comments

Comments
 (0)