Skip to content

Commit 4cf5f63

Browse files
mvadarimvadari
committed
Merge branch 'main' into smart-escrows
2 parents 72fefcb + c97bbab commit 4cf5f63

File tree

10 files changed

+439
-52
lines changed

10 files changed

+439
-52
lines changed

‎.ci-config/rippled.cfg‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,8 @@ online_delete=256
6363
[debug_logfile]
6464
/var/log/rippled/debug.log
6565

66-
67-
[ips]
68-
r.ripple.com 51235
66+
[network_id]
67+
0
6968

7069

7170
[rpc_startup]

‎.vscode/settings.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
"multisign",
1111
"multisigned",
1212
"multisigning",
13+
"Permissioned",
1314
"preauthorization",
1415
"rippletest",
1516
"secp256k1",

‎packages/ripple-binary-codec/package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@
2121
"prepublishOnly": "npm test",
2222
"test": "npm run build && jest --verbose false --silent=false ./test/*.test.ts",
2323
"test:browser": "npm run build && karma start ./karma.config.js",
24-
"lint": "eslint . --ext .ts --ext .test.js"
24+
"lint": "eslint . --ext .ts --ext .test.js",
25+
"generateDefinitions": "node ./tools/generateDefinitions.js"
2526
},
2627
"keywords": [
2728
"ripple",

‎packages/ripple-binary-codec/src/enums/definitions.json‎

Lines changed: 42 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -933,20 +933,20 @@
933933
[
934934
"IssuerNode",
935935
{
936-
"nth": 27,
937-
"isVLEncoded": false,
938936
"isSerialized": true,
939937
"isSigningField": true,
938+
"isVLEncoded": false,
939+
"nth": 27,
940940
"type": "UInt64"
941941
}
942942
],
943943
[
944944
"SubjectNode",
945945
{
946-
"nth": 28,
947-
"isVLEncoded": false,
948946
"isSerialized": true,
949947
"isSigningField": true,
948+
"isVLEncoded": false,
949+
"nth": 28,
950950
"type": "UInt64"
951951
}
952952
],
@@ -1273,10 +1273,10 @@
12731273
[
12741274
"DomainID",
12751275
{
1276-
"nth": 34,
1277-
"isVLEncoded": false,
12781276
"isSerialized": true,
12791277
"isSigningField": true,
1278+
"isVLEncoded": false,
1279+
"nth": 34,
12801280
"type": "Hash256"
12811281
}
12821282
],
@@ -1863,10 +1863,10 @@
18631863
[
18641864
"CredentialType",
18651865
{
1866-
"nth": 31,
1867-
"isVLEncoded": true,
18681866
"isSerialized": true,
18691867
"isSigningField": true,
1868+
"isVLEncoded": true,
1869+
"nth": 31,
18701870
"type": "Blob"
18711871
}
18721872
],
@@ -2053,13 +2053,23 @@
20532053
[
20542054
"Subject",
20552055
{
2056-
"nth": 24,
2057-
"isVLEncoded": true,
20582056
"isSerialized": true,
20592057
"isSigningField": true,
2058+
"isVLEncoded": true,
2059+
"nth": 24,
20602060
"type": "AccountID"
20612061
}
20622062
],
2063+
[
2064+
"Number",
2065+
{
2066+
"isSerialized": true,
2067+
"isSigningField": true,
2068+
"isVLEncoded": false,
2069+
"nth": 1,
2070+
"type": "Number"
2071+
}
2072+
],
20632073
[
20642074
"TransactionMetaData",
20652075
{
@@ -2353,10 +2363,10 @@
23532363
[
23542364
"Credential",
23552365
{
2356-
"nth": 33,
2357-
"isVLEncoded": false,
23582366
"isSerialized": true,
23592367
"isSigningField": true,
2368+
"isVLEncoded": false,
2369+
"nth": 33,
23602370
"type": "STObject"
23612371
}
23622372
],
@@ -2553,29 +2563,30 @@
25532563
[
25542564
"AuthorizeCredentials",
25552565
{
2556-
"nth": 26,
2557-
"isVLEncoded": false,
25582566
"isSerialized": true,
25592567
"isSigningField": true,
2568+
"isVLEncoded": false,
2569+
"nth": 26,
25602570
"type": "STArray"
25612571
}
25622572
],
25632573
[
25642574
"UnauthorizeCredentials",
25652575
{
2566-
"nth": 27,
2567-
"isVLEncoded": false,
25682576
"isSerialized": true,
25692577
"isSigningField": true,
2578+
"isVLEncoded": false,
2579+
"nth": 27,
25702580
"type": "STArray"
25712581
}
25722582
],
25732583
[
2574-
"AcceptedCredentials", {
2575-
"nth": 28,
2576-
"isVLEncoded": false,
2584+
"AcceptedCredentials",
2585+
{
25772586
"isSerialized": true,
25782587
"isSigningField": true,
2588+
"isVLEncoded": false,
2589+
"nth": 28,
25792590
"type": "STArray"
25802591
}
25812592
],
@@ -2762,10 +2773,10 @@
27622773
[
27632774
"CredentialIDs",
27642775
{
2765-
"nth": 5,
2766-
"isVLEncoded": true,
27672776
"isSerialized": true,
27682777
"isSigningField": true,
2778+
"isVLEncoded": true,
2779+
"nth": 5,
27692780
"type": "Vector256"
27702781
}
27712782
],
@@ -2896,6 +2907,7 @@
28962907
"Amendments": 102,
28972908
"Bridge": 105,
28982909
"Check": 67,
2910+
"Credential": 129,
28992911
"DID": 73,
29002912
"DepositPreauth": 112,
29012913
"DirectoryNode": 100,
@@ -2910,7 +2922,6 @@
29102922
"NegativeUNL": 78,
29112923
"Offer": 111,
29122924
"Oracle": 128,
2913-
"Credential": 129,
29142925
"PayChannel": 120,
29152926
"PermissionedDomain": 130,
29162927
"RippleState": 114,
@@ -2940,6 +2951,7 @@
29402951
"tecFAILED_PROCESSING": 105,
29412952
"tecFROZEN": 137,
29422953
"tecHAS_OBLIGATIONS": 151,
2954+
"tecHOOK_REJECTED": 153,
29432955
"tecINCOMPLETE": 169,
29442956
"tecINSUFFICIENT_FUNDS": 159,
29452957
"tecINSUFFICIENT_PAYMENT": 161,
@@ -2999,6 +3011,7 @@
29993011
"tecXCHAIN_SELF_COMMIT": 184,
30003012
"tecXCHAIN_SENDING_ACCOUNT_MISMATCH": 179,
30013013
"tecXCHAIN_WRONG_CHAIN": 176,
3014+
30023015
"tefALREADY": -198,
30033016
"tefBAD_ADD_AUTH": -197,
30043017
"tefBAD_AUTH": -196,
@@ -3021,6 +3034,7 @@
30213034
"tefPAST_SEQ": -190,
30223035
"tefTOO_BIG": -181,
30233036
"tefWRONG_PRIOR": -189,
3037+
30243038
"telBAD_DOMAIN": -398,
30253039
"telBAD_PATH_COUNT": -397,
30263040
"telBAD_PUBLIC_KEY": -396,
@@ -3038,6 +3052,7 @@
30383052
"telNO_DST_PARTIAL": -393,
30393053
"telREQUIRES_NETWORK_ID": -385,
30403054
"telWRONG_NETWORK": -386,
3055+
30413056
"temARRAY_EMPTY": -253,
30423057
"temARRAY_TOO_LARGE": -252,
30433058
"temBAD_AMM_TOKENS": -261,
@@ -3087,6 +3102,7 @@
30873102
"temXCHAIN_BRIDGE_BAD_REWARD_AMOUNT": -255,
30883103
"temXCHAIN_BRIDGE_NONDOOR_OWNER": -257,
30893104
"temXCHAIN_EQUAL_DOOR_ACCOUNTS": -260,
3105+
30903106
"terFUNDS_SPENT": -98,
30913107
"terINSUF_FEE_B": -97,
30923108
"terLAST": -91,
@@ -3100,6 +3116,7 @@
31003116
"terPRE_TICKET": -88,
31013117
"terQUEUED": -89,
31023118
"terRETRY": -99,
3119+
31033120
"tesSUCCESS": 0
31043121
},
31053122
"TRANSACTION_TYPES": {
@@ -3116,8 +3133,8 @@
31163133
"CheckCash": 17,
31173134
"CheckCreate": 16,
31183135
"Clawback": 30,
3119-
"CredentialCreate": 58,
31203136
"CredentialAccept": 59,
3137+
"CredentialCreate": 58,
31213138
"CredentialDelete": 60,
31223139
"DIDDelete": 50,
31233140
"DIDSet": 49,
@@ -3146,8 +3163,8 @@
31463163
"PaymentChannelClaim": 15,
31473164
"PaymentChannelCreate": 13,
31483165
"PaymentChannelFund": 14,
3149-
"PermissionedDomainSet": 62,
31503166
"PermissionedDomainDelete": 63,
3167+
"PermissionedDomainSet": 62,
31513168
"SetFee": 101,
31523169
"SetRegularKey": 5,
31533170
"SignerListSet": 12,
@@ -3177,6 +3194,7 @@
31773194
"LedgerEntry": 10002,
31783195
"Metadata": 10004,
31793196
"NotPresent": 0,
3197+
"Number": 9,
31803198
"PathSet": 18,
31813199
"STArray": 15,
31823200
"STObject": 14,

0 commit comments

Comments
 (0)