Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# X Coin (XFER)

**Download [1.0.13](https://github.com/NiftyRaven/x-coin/releases/tag/v1.0.13).**
Do not run 1.0.12 or older if you need Claim My Asset to confirm. Seed is lottery law.
**Download [1.0.14](https://github.com/NiftyRaven/x-coin/releases/tag/v1.0.14).**
Do not run 1.0.13 or older if you need Share lottery wins. Seed is lottery law.
Do **not** use **Code → Download ZIP**.

- Windows: [X-Coin-1.0.13-Windows.zip](https://github.com/NiftyRaven/x-coin/releases/download/v1.0.13/X-Coin-1.0.13-Windows.zip)
- Linux: [X-Coin-1.0.13-Linux-x86_64.tar.gz](https://github.com/NiftyRaven/x-coin/releases/download/v1.0.13/X-Coin-1.0.13-Linux-x86_64.tar.gz)
- Windows: [X-Coin-1.0.14-Windows.zip](https://github.com/NiftyRaven/x-coin/releases/download/v1.0.14/X-Coin-1.0.14-Windows.zip)
- Linux: [X-Coin-1.0.14-Linux-x86_64.tar.gz](https://github.com/NiftyRaven/x-coin/releases/download/v1.0.14/X-Coin-1.0.14-Linux-x86_64.tar.gz)

**Nifty Raven** (@NFTRVN on X)
Anonymous public identity — display name and handle only.
Expand All @@ -19,7 +19,7 @@ on **Linux** and **Windows**.

### Windows, double-click

1. Download [X-Coin-1.0.13-Windows.zip](https://github.com/NiftyRaven/x-coin/releases/download/v1.0.13/X-Coin-1.0.13-Windows.zip).
1. Download [X-Coin-1.0.14-Windows.zip](https://github.com/NiftyRaven/x-coin/releases/download/v1.0.14/X-Coin-1.0.14-Windows.zip).
2. Right-click → Extract All.
3. Open the folder that appears. **X Coin Wallet.exe** is in that first folder.
4. Double-click **X Coin Wallet.exe**. The wallet window opens.
Expand All @@ -33,8 +33,8 @@ Wallet.exe** only. Do not open the real wallet until launch night.

### Linux, double-click

1. Download [X-Coin-1.0.13-Linux-x86_64.tar.gz](https://github.com/NiftyRaven/x-coin/releases/download/v1.0.13/X-Coin-1.0.13-Linux-x86_64.tar.gz).
2. Right-click → Extract, or run `tar -xzf X-Coin-1.0.13-Linux-x86_64.tar.gz`.
1. Download [X-Coin-1.0.14-Linux-x86_64.tar.gz](https://github.com/NiftyRaven/x-coin/releases/download/v1.0.14/X-Coin-1.0.14-Linux-x86_64.tar.gz).
2. Right-click → Extract, or run `tar -xzf X-Coin-1.0.14-Linux-x86_64.tar.gz`.
3. Open the folder that appears. **X Coin Wallet** is in that first folder.
4. Double-click **X Coin Wallet**. The wallet window opens. You do not
need a terminal.
Expand Down
6 changes: 3 additions & 3 deletions docs/GO-LIVE.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ There are no public DNS seeds. Packaged `xcoin.conf` already has

| Role | What to run |
| --- | --- |
| Baked seed | Headless `xcoind` 1.0.12 on Azure. Attestor key + X bearer. **No Sign-in.** |
| Everyone else | **1.0.13** desktop zip from [Releases](https://github.com/NiftyRaven/x-coin/releases/tag/v1.0.13). Sign in with X. Leave the window open. |
| Baked seed | Headless `xcoind` 1.0.14 on Azure. Attestor key + X bearer. **No Sign-in.** |
| Everyone else | **1.0.14** desktop zip from [Releases](https://github.com/NiftyRaven/x-coin/releases/tag/v1.0.14). Sign in with X. Leave the window open. |

The seed is **not** a user’s double-clicked wallet. Do not Sign in on
the seed. Do not put `xattestor.key` or the bearer in the zip.
Expand All @@ -30,7 +30,7 @@ There is **no** slot+120 abort.

## User path (launch night)

1. Download **1.0.13** (not 1.0.12 for Claim, not Code → Download ZIP).
1. Download **1.0.14** (not 1.0.13 for Share lottery wins, not Code → Download ZIP).
2. Double-click **X Coin Wallet** / **X Coin Wallet.exe**.
3. Sign in with X once. Claim the free root if you want the identity
asset (blue check not required for the root; required for the hat).
Expand Down
3 changes: 3 additions & 0 deletions src/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@ RAVEN_CORE_H = \
merkleblock.h \
miner.h \
lottery.h \
xmarket.h \
hostshare.h \
xlookup.h \
xrelease.h \
Expand Down Expand Up @@ -267,6 +268,7 @@ libraven_server_a_SOURCES = \
merkleblock.cpp \
miner.cpp \
lottery.cpp \
xmarket.cpp \
hostshare.cpp \
xlookup.cpp \
xrelease.cpp \
Expand Down Expand Up @@ -294,6 +296,7 @@ libraven_server_a_SOURCES = \
rpc/messages.cpp \
rpc/mining.cpp \
rpc/lottery.cpp \
rpc/market.cpp \
rpc/misc.cpp \
rpc/net.cpp \
rpc/rawtransaction.cpp \
Expand Down
19 changes: 17 additions & 2 deletions src/Makefile.qt.include
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,10 @@ QT_MOC_CPP = \
qt/moc_xreleasedialog.cpp \
qt/moc_xreceive.cpp \
qt/moc_xsend.cpp \
qt/moc_xrewardshare.cpp \
qt/moc_xrewarddividend.cpp \
qt/moc_xnodepage.cpp \
qt/moc_xswap.cpp \
qt/moc_assetsdialog.cpp \
qt/moc_createassetdialog.cpp \
qt/moc_reissueassetdialog.cpp \
Expand Down Expand Up @@ -287,7 +291,12 @@ RAVEN_QT_H = \
qt/xoauth.h \
qt/xreleasedialog.h \
qt/xreceive.h \
qt/xsend.h
qt/xsend.h \
qt/xrewardshare.h \
qt/xrewarddividend.h \
qt/xnodepage.h \
qt/xtheme.h \
qt/xswap.h

RES_ICONS = \
qt/res/icons/add.png \
Expand Down Expand Up @@ -389,6 +398,7 @@ RES_ICONS = \
qt/res/darkstyle/icon_radiobutton_unchecked_pressed.png \
qt/res/darkstyle/icon_radiobutton_checked_disabled.png \
qt/res/darkstyle/icon_radiobutton_unchecked_disabled.png \
qt/res/darkstyle/xpages.qss \
qt/res/fonts/OpenSans-Bold.ttf \
qt/res/fonts/OpenSans-BoldItalic.ttf \
qt/res/fonts/OpenSans-ExtraBold.ttf \
Expand Down Expand Up @@ -473,7 +483,12 @@ RAVEN_QT_WALLET_CPP = \
qt/xoauth.cpp \
qt/xreleasedialog.cpp \
qt/xreceive.cpp \
qt/xsend.cpp
qt/xsend.cpp \
qt/xtheme.cpp \
qt/xrewardshare.cpp \
qt/xrewarddividend.cpp \
qt/xnodepage.cpp \
qt/xswap.cpp

RAVEN_QT_CPP = $(RAVEN_QT_BASE_CPP)
if TARGET_WINDOWS
Expand Down
11 changes: 11 additions & 0 deletions src/net_processing.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
#include "utilmoneystr.h"
#include "utilstrencodings.h"
#include "lottery.h"
#include "xmarket.h"
#include "xsession.h"
#include "assets/xaccount.h"
#include "validationinterface.h"
Expand Down Expand Up @@ -1803,6 +1804,7 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr
xsession::SessionIsXVerified(), hbSig, attest));
}
}
xmarket::PushBook(pfrom, *connman);
}

else if (!pfrom->fSuccessfullyConnected)
Expand Down Expand Up @@ -3042,6 +3044,15 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr
}
}

else if (strCommand == NetMsgType::XORD)
{
const int score = xmarket::ProcessXord(pfrom, vRecv, *connman);
if (score > 0) {
LOCK(cs_main);
Misbehaving(pfrom->GetId(), score);
}
}

else {
// Ignore unknown commands for extensibility
LogPrint(BCLog::NET, "Unknown command \"%s\" from peer=%d\n", SanitizeString(strCommand), pfrom->GetId());
Expand Down
4 changes: 3 additions & 1 deletion src/protocol.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ const char *GETASSETDATA="getassetdata";
const char *ASSETDATA="assetdata";
const char *ASSETNOTFOUND ="asstnotfound";
const char *XHB="xhb";
const char *XORD="xord";
} // namespace NetMsgType

/** All known message types. Keep this in the same order as the list of
Expand Down Expand Up @@ -79,7 +80,8 @@ const static std::string allNetMessageTypes[] = {
NetMsgType::GETASSETDATA,
NetMsgType::ASSETDATA,
NetMsgType::ASSETNOTFOUND,
NetMsgType::XHB
NetMsgType::XHB,
NetMsgType::XORD
};
const static std::vector<std::string> allNetMessageTypesVec(allNetMessageTypes, allNetMessageTypes+ARRAYLEN(allNetMessageTypes));

Expand Down
5 changes: 5 additions & 0 deletions src/protocol.h
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,11 @@ extern const char *ASSETDATA;
* id = Hash160(script). Honest peers relay so they share one active set.
*/
extern const char *XHB;
/**
* X Coin marketplace ask: one serialized partial CTransaction
* (asset vin + XFER vout, signed SINGLE|ANYONECANPAY). Old nodes ignore it.
*/
extern const char *XORD;
};

/* Get a vector of all valid message types (see above) */
Expand Down
4 changes: 2 additions & 2 deletions src/qt/forms/modaloverlay.ui
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@
<item>
<widget class="QWidget" name="contentWidget" native="true">
<property name="styleSheet">
<string notr="true">#contentWidget { background: rgba(255,255,255,240); border-radius: 6px; }
<string notr="true">#contentWidget { background: #0a0a0a; border: 1px solid #ffffff; }

QLabel { color: rgb(40,40,40); }</string>
QLabel { color: #ffffff; }</string>
</property>
<layout class="QVBoxLayout" name="verticalLayoutSub" stretch="1,0,0,0">
<property name="spacing">
Expand Down
1 change: 1 addition & 0 deletions src/qt/raven.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@
</qresource>
<qresource prefix="/darkstyle">
<file alias="qss">res/darkstyle/darkstyle.qss</file>
<file alias="xpages">res/darkstyle/xpages.qss</file>
<file alias="close">res/darkstyle/icon_close.png</file>
<file alias="restore">res/darkstyle/icon_restore.png</file>
<file alias="undock">res/darkstyle/icon_undock.png</file>
Expand Down
Loading
Loading