Skip to content

Commit d023566

Browse files
author
jed
committedNov 4, 2012
XNS -> XRP
1 parent f180da5 commit d023566

19 files changed

+128
-56
lines changed
 

‎newcoin.vcxproj

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,15 +206,20 @@
206206
<ClInclude Include="src\ConnectionPool.h" />
207207
<ClInclude Include="src\Contract.h" />
208208
<ClInclude Include="src\Conversion.h" />
209+
<ClInclude Include="src\FieldNames.h" />
209210
<ClInclude Include="src\HashedObject.h" />
211+
<ClInclude Include="src\HashPrefixes.h" />
210212
<ClInclude Include="src\HttpReply.h" />
211213
<ClInclude Include="src\HttpRequest.h" />
212214
<ClInclude Include="src\HttpsClient.h" />
215+
<ClInclude Include="src\InstanceCounter.h" />
213216
<ClInclude Include="src\Interpreter.h" />
217+
<ClInclude Include="src\JobQueue.h" />
214218
<ClInclude Include="src\key.h" />
215219
<ClInclude Include="src\Ledger.h" />
216220
<ClInclude Include="src\LedgerAcquire.h" />
217221
<ClInclude Include="src\LedgerConsensus.h" />
222+
<ClInclude Include="src\LedgerEntrySet.h" />
218223
<ClInclude Include="src\LedgerFormats.h" />
219224
<ClInclude Include="src\LedgerHistory.h" />
220225
<ClInclude Include="src\LedgerMaster.h" />
@@ -234,8 +239,12 @@
234239
<ClInclude Include="src\Peer.h" />
235240
<ClInclude Include="src\PeerDoor.h" />
236241
<ClInclude Include="src\PubKeyCache.h" />
242+
<ClInclude Include="src\RangeSet.h" />
237243
<ClInclude Include="src\RequestParser.h" />
238244
<ClInclude Include="src\rfc1751.h" />
245+
<ClInclude Include="src\ripple.pb.h" />
246+
<ClInclude Include="src\RippleAddress.h" />
247+
<ClInclude Include="src\RippleCalc.h" />
239248
<ClInclude Include="src\RippleLines.h" />
240249
<ClInclude Include="src\RippleState.h" />
241250
<ClInclude Include="src\RPC.h" />
@@ -251,19 +260,28 @@
251260
<ClInclude Include="src\SerializedTransaction.h" />
252261
<ClInclude Include="src\SerializedTypes.h" />
253262
<ClInclude Include="src\SerializedValidation.h" />
263+
<ClInclude Include="src\SerializeProto.h" />
254264
<ClInclude Include="src\Serializer.h" />
255265
<ClInclude Include="src\SHAMap.h" />
266+
<ClInclude Include="src\SHAMapSync.h" />
267+
<ClInclude Include="src\SNTPClient.h" />
268+
<ClInclude Include="src\Suppression.h" />
256269
<ClInclude Include="src\TaggedCache.h" />
257270
<ClInclude Include="src\Transaction.h" />
258271
<ClInclude Include="src\TransactionEngine.h" />
272+
<ClInclude Include="src\TransactionErr.h" />
259273
<ClInclude Include="src\TransactionFormats.h" />
260274
<ClInclude Include="src\TransactionMaster.h" />
275+
<ClInclude Include="src\TransactionMeta.h" />
261276
<ClInclude Include="src\types.h" />
262277
<ClInclude Include="src\uint256.h" />
263278
<ClInclude Include="src\UniqueNodeList.h" />
264279
<ClInclude Include="src\utils.h" />
265280
<ClInclude Include="src\ValidationCollection.h" />
281+
<ClInclude Include="src\Version.h" />
266282
<ClInclude Include="src\Wallet.h" />
283+
<ClInclude Include="src\WSConnection.h" />
284+
<ClInclude Include="src\WSDoor.h" />
267285
<ClInclude Include="src\WSHandler.h" />
268286
<ClInclude Include="TimingService.h" />
269287
<ClInclude Include="ExtendedTransaction.h" />

‎newcoin.vcxproj.filters

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -578,6 +578,60 @@
578578
<ClInclude Include="src\WSHandler.h">
579579
<Filter>Header Files</Filter>
580580
</ClInclude>
581+
<ClInclude Include="src\FieldNames.h">
582+
<Filter>Header Files</Filter>
583+
</ClInclude>
584+
<ClInclude Include="src\HashPrefixes.h">
585+
<Filter>Header Files</Filter>
586+
</ClInclude>
587+
<ClInclude Include="src\InstanceCounter.h">
588+
<Filter>Header Files</Filter>
589+
</ClInclude>
590+
<ClInclude Include="src\JobQueue.h">
591+
<Filter>Header Files</Filter>
592+
</ClInclude>
593+
<ClInclude Include="src\LedgerEntrySet.h">
594+
<Filter>Header Files</Filter>
595+
</ClInclude>
596+
<ClInclude Include="src\RangeSet.h">
597+
<Filter>Header Files</Filter>
598+
</ClInclude>
599+
<ClInclude Include="src\ripple.pb.h">
600+
<Filter>Header Files</Filter>
601+
</ClInclude>
602+
<ClInclude Include="src\RippleAddress.h">
603+
<Filter>Header Files</Filter>
604+
</ClInclude>
605+
<ClInclude Include="src\RippleCalc.h">
606+
<Filter>Header Files</Filter>
607+
</ClInclude>
608+
<ClInclude Include="src\SerializeProto.h">
609+
<Filter>Header Files</Filter>
610+
</ClInclude>
611+
<ClInclude Include="src\SHAMapSync.h">
612+
<Filter>Header Files</Filter>
613+
</ClInclude>
614+
<ClInclude Include="src\SNTPClient.h">
615+
<Filter>Header Files</Filter>
616+
</ClInclude>
617+
<ClInclude Include="src\Suppression.h">
618+
<Filter>Header Files</Filter>
619+
</ClInclude>
620+
<ClInclude Include="src\TransactionErr.h">
621+
<Filter>Header Files</Filter>
622+
</ClInclude>
623+
<ClInclude Include="src\TransactionMeta.h">
624+
<Filter>Header Files</Filter>
625+
</ClInclude>
626+
<ClInclude Include="src\Version.h">
627+
<Filter>Header Files</Filter>
628+
</ClInclude>
629+
<ClInclude Include="src\WSConnection.h">
630+
<Filter>Header Files</Filter>
631+
</ClInclude>
632+
<ClInclude Include="src\WSDoor.h">
633+
<Filter>Header Files</Filter>
634+
</ClInclude>
581635
</ItemGroup>
582636
<ItemGroup>
583637
<None Include="wallet.xml" />

‎src/Amount.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ SETUP_LOG();
1616

1717
uint64 STAmount::uRateOne = STAmount::getRate(STAmount(1), STAmount(1));
1818

19-
// --> sCurrency: "", "XNS", or three letter ISO code.
19+
// --> sCurrency: "", "XRP", or three letter ISO code.
2020
bool STAmount::currencyFromString(uint160& uDstCurrency, const std::string& sCurrency)
2121
{
2222
bool bSuccess = true;
@@ -1365,19 +1365,19 @@ BOOST_AUTO_TEST_CASE( CustomCurrency_test )
13651365

13661366
if (STAmount::multiply(STAmount(CURRENCY_ONE, ACCOUNT_ONE, 20), STAmount(3), CURRENCY_ONE, ACCOUNT_ONE).getText() != "60")
13671367
BOOST_FAIL("STAmount multiply fail");
1368-
if (STAmount::multiply(STAmount(CURRENCY_ONE, ACCOUNT_ONE, 20), STAmount(3), uint160(), ACCOUNT_XNS).getText() != "60")
1368+
if (STAmount::multiply(STAmount(CURRENCY_ONE, ACCOUNT_ONE, 20), STAmount(3), uint160(), ACCOUNT_XRP).getText() != "60")
13691369
BOOST_FAIL("STAmount multiply fail");
13701370
if (STAmount::multiply(STAmount(20), STAmount(3), CURRENCY_ONE, ACCOUNT_ONE).getText() != "60")
13711371
BOOST_FAIL("STAmount multiply fail");
1372-
if (STAmount::multiply(STAmount(20), STAmount(3), uint160(), ACCOUNT_XNS).getText() != "60")
1372+
if (STAmount::multiply(STAmount(20), STAmount(3), uint160(), ACCOUNT_XRP).getText() != "60")
13731373
BOOST_FAIL("STAmount multiply fail");
13741374
if (STAmount::divide(STAmount(CURRENCY_ONE, ACCOUNT_ONE, 60), STAmount(3), CURRENCY_ONE, ACCOUNT_ONE).getText() != "20")
13751375
BOOST_FAIL("STAmount divide fail");
1376-
if (STAmount::divide(STAmount(CURRENCY_ONE, ACCOUNT_ONE, 60), STAmount(3), uint160(), ACCOUNT_XNS).getText() != "20")
1376+
if (STAmount::divide(STAmount(CURRENCY_ONE, ACCOUNT_ONE, 60), STAmount(3), uint160(), ACCOUNT_XRP).getText() != "20")
13771377
BOOST_FAIL("STAmount divide fail");
13781378
if (STAmount::divide(STAmount(CURRENCY_ONE, ACCOUNT_ONE, 60), STAmount(CURRENCY_ONE, ACCOUNT_ONE, 3), CURRENCY_ONE, ACCOUNT_ONE).getText() != "20")
13791379
BOOST_FAIL("STAmount divide fail");
1380-
if (STAmount::divide(STAmount(CURRENCY_ONE, ACCOUNT_ONE, 60), STAmount(CURRENCY_ONE, ACCOUNT_ONE, 3), uint160(), ACCOUNT_XNS).getText() != "20")
1380+
if (STAmount::divide(STAmount(CURRENCY_ONE, ACCOUNT_ONE, 60), STAmount(CURRENCY_ONE, ACCOUNT_ONE, 3), uint160(), ACCOUNT_XRP).getText() != "20")
13811381
BOOST_FAIL("STAmount divide fail");
13821382

13831383
STAmount a1(CURRENCY_ONE, ACCOUNT_ONE, 60), a2 (CURRENCY_ONE, ACCOUNT_ONE, 10, -1);

‎src/Config.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
#define SECTION_VALIDATORS "validators"
3636
#define SECTION_VALIDATORS_SITE "validators_site"
3737

38-
// Fees are in XNS.
38+
// Fees are in XRP.
3939
#define DEFAULT_FEE_DEFAULT 10
4040
#define DEFAULT_FEE_ACCOUNT_CREATE 1000*SYSTEM_CURRENCY_PARTS
4141
#define DEFAULT_FEE_NICKNAME_CREATE 1000

‎src/Config.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
#include <boost/filesystem.hpp>
1111

1212
#define SYSTEM_NAME "ripple"
13-
#define SYSTEM_CURRENCY_CODE "XNS"
13+
#define SYSTEM_CURRENCY_CODE "XRP"
1414
#define SYSTEM_CURRENCY_PRECISION 6
15-
#define SYSTEM_CURRENCY_CODE_RIPPLE "XNR"
15+
#define SYSTEM_CURRENCY_CODE_RIPPLE "XRR"
1616

1717
#define SYSTEM_CURRENCY_GIFT 1000ull
1818
#define SYSTEM_CURRENCY_USERS 100000000ull

‎src/Interpreter.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ Interpreter::Interpreter()
4646
mFunctionTable[CANCEL_OP]=new SubOp();
4747
mFunctionTable[BLOCK_OP]=new SubOp();
4848
mFunctionTable[BLOCK_END_OP]=new SubOp();
49-
mFunctionTable[SEND_XNS_OP]=new SendXNSOp();
49+
mFunctionTable[SEND_XRP_OP]=new SendXRPOp();
5050
/*
5151
mFunctionTable[SEND_OP]=new SendOp();
5252
mFunctionTable[REMOVE_CONTRACT_OP]=new SubOp();
@@ -63,7 +63,7 @@ Interpreter::Interpreter()
6363
mFunctionTable[GET_LEDGER_TIME_OP]=new SubOp();
6464
mFunctionTable[GET_LEDGER_NUM_OP]=new SubOp();
6565
mFunctionTable[GET_RAND_FLOAT_OP]=new SubOp();
66-
mFunctionTable[GET_XNS_ESCROWED_OP]=new SubOp();
66+
mFunctionTable[GET_XRP_ESCROWED_OP]=new SubOp();
6767
mFunctionTable[GET_RIPPLE_ESCROWED_OP]=new SubOp();
6868
mFunctionTable[GET_RIPPLE_ESCROWED_CURRENCY_OP]=new SubOp();
6969
mFunctionTable[GET_RIPPLE_ESCROWED_ISSUER]=new GetRippleEscrowedIssuerOp();

‎src/Interpreter.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,12 @@ class Interpreter
3939
STOP_OP, CANCEL_OP,
4040

4141
BLOCK_OP, BLOCK_END_OP,
42-
SEND_XNS_OP,SEND_OP,REMOVE_CONTRACT_OP,FEE_OP,CHANGE_CONTRACT_OWNER_OP,
42+
SEND_XRP_OP,SEND_OP,REMOVE_CONTRACT_OP,FEE_OP,CHANGE_CONTRACT_OWNER_OP,
4343
STOP_REMOVE_OP,
4444
SET_DATA_OP,GET_DATA_OP, GET_NUM_DATA_OP,
4545
SET_REGISTER_OP,GET_REGISTER_OP,
4646
GET_ISSUER_ID_OP, GET_OWNER_ID_OP, GET_LEDGER_TIME_OP, GET_LEDGER_NUM_OP, GET_RAND_FLOAT_OP,
47-
GET_XNS_ESCROWED_OP, GET_RIPPLE_ESCROWED_OP, GET_RIPPLE_ESCROWED_CURRENCY_OP, GET_RIPPLE_ESCROWED_ISSUER,
47+
GET_XRP_ESCROWED_OP, GET_RIPPLE_ESCROWED_OP, GET_RIPPLE_ESCROWED_CURRENCY_OP, GET_RIPPLE_ESCROWED_ISSUER,
4848
GET_ACCEPT_DATA_OP, GET_ACCEPTOR_ID_OP, GET_CONTRACT_ID_OP,
4949
NUM_OF_OPS };
5050

‎src/Ledger.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -563,7 +563,7 @@ Json::Value Ledger::getJson(int options)
563563
}
564564
else
565565
ledger["closed"] = false;
566-
if (mTransactionMap && (full || ((options & LEDGER_JSON_DUMP_TXNS) != 0)))
566+
if (mTransactionMap && (full || ((options & LEDGER_JSON_DUMP_TXRP) != 0)))
567567
{
568568
Json::Value txns(Json::arrayValue);
569569
SHAMapTreeNode::TNType type;

‎src/Ledger.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ enum LedgerStateParms
3535
lepERROR = 32, // error
3636
};
3737

38-
#define LEDGER_JSON_DUMP_TXNS 0x10000000
38+
#define LEDGER_JSON_DUMP_TXRP 0x10000000
3939
#define LEDGER_JSON_DUMP_STATE 0x20000000
4040
#define LEDGER_JSON_FULL 0x40000000
4141

‎src/LedgerConsensus.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1117,7 +1117,7 @@ void LedgerConsensus::accept(SHAMap::ref set)
11171117
{
11181118
Log(lsTRACE) << "newLCL";
11191119
Json::Value p;
1120-
newLCL->addJson(p, LEDGER_JSON_DUMP_TXNS | LEDGER_JSON_DUMP_STATE);
1120+
newLCL->addJson(p, LEDGER_JSON_DUMP_TXRP | LEDGER_JSON_DUMP_STATE);
11211121
Log(lsTRACE) << p;
11221122
}
11231123

‎src/Operation.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ class JumpOp : public Operation
276276
}
277277
};
278278

279-
class SendXNSOp : public Operation
279+
class SendXRPOp : public Operation
280280
{
281281
public:
282282
bool work(Interpreter* interpreter)

‎src/OrderBookDB.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ OrderBookDB::OrderBookDB(Ledger::pointer ledger)
2020
mKnownMap[book->getBookBase()]=true;
2121

2222
if(!book->getCurrencyIn())
23-
{ // XNS
24-
mXNSOrders.push_back(book);
23+
{ // XRP
24+
mXRPOrders.push_back(book);
2525
}else
2626
{
2727
mIssuerMap[book->getIssuerIn()].push_back(book);

‎src/OrderBookDB.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@ But for now it is probably faster to just generate it each time
99
class OrderBookDB
1010
{
1111
std::vector<OrderBook::pointer> mEmptyVector;
12-
std::vector<OrderBook::pointer> mXNSOrders;
12+
std::vector<OrderBook::pointer> mXRPOrders;
1313
std::map<uint160, std::vector<OrderBook::pointer> > mIssuerMap;
1414

1515
std::map<uint256, bool > mKnownMap;
1616

1717
public:
1818
OrderBookDB(Ledger::pointer ledger);
1919

20-
// return list of all orderbooks that want XNS
21-
std::vector<OrderBook::pointer>& getXNSInBooks(){ return mXNSOrders; }
20+
// return list of all orderbooks that want XRP
21+
std::vector<OrderBook::pointer>& getXRPInBooks(){ return mXRPOrders; }
2222
// return list of all orderbooks that want IssuerID
2323
std::vector<OrderBook::pointer>& getBooks(const uint160& issuerID);
2424
// return list of all orderbooks that want this issuerID and currencyID

‎src/Pathfinder.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,18 @@ TODO: what is a good way to come up with multiple paths?
2121
2222
2323
OrderDB:
24-
getXNSOffers();
24+
getXRPOffers();
2525
26-
// return list of all orderbooks that want XNS
26+
// return list of all orderbooks that want XRP
2727
// return list of all orderbooks that want IssuerID
2828
// return list of all orderbooks that want this issuerID and currencyID
2929
*/
3030

3131
/*
32-
Test sending to XNS
33-
Test XNS to XNS
32+
Test sending to XRP
33+
Test XRP to XRP
3434
Test offer in middle
35-
Test XNS to USD
35+
Test XRP to USD
3636
Test USD to EUR
3737
*/
3838

@@ -113,7 +113,7 @@ bool Pathfinder::findPaths(int maxSearchSteps, int maxPay, STPathSet& retPathSet
113113
// found the destination
114114

115115
if (!ele.mCurrencyID) {
116-
BOOST_FOREACH(OrderBook::pointer book,mOrderBook.getXNSInBooks())
116+
BOOST_FOREACH(OrderBook::pointer book,mOrderBook.getXRPInBooks())
117117
{
118118
//if (!path.hasSeen(line->getAccountIDPeer().getAccountID()))
119119
{
@@ -188,17 +188,17 @@ bool Pathfinder::checkComplete(STPathSet& retPathSet)
188188

189189

190190
// get all the options from this accountID
191-
// if source is XNS
192-
// every offer that wants XNS
191+
// if source is XRP
192+
// every offer that wants XRP
193193
// else
194194
// every ripple line that starts with the source currency
195195
// every offer that we can take that wants the source currency
196196

197197
void Pathfinder::addOptions(PathOption::pointer tail)
198198
{
199199
if(!tail->mCurrencyID)
200-
{ // source XNS
201-
BOOST_FOREACH(OrderBook::pointer book,mOrderBook.getXNSInBooks())
200+
{ // source XRP
201+
BOOST_FOREACH(OrderBook::pointer book,mOrderBook.getXRPInBooks())
202202
{
203203
PathOption::pointer pathOption(new PathOption(tail));
204204

0 commit comments

Comments
 (0)
Please sign in to comment.