Skip to content
This repository was archived by the owner on Jun 4, 2025. It is now read-only.
Open
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
Binary file modified xDagWalletCLI/XDagRuntime.cpp
Binary file not shown.
2 changes: 1 addition & 1 deletion xDagWalletCLI/XDagRuntime.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ namespace XDagNetWalletCLI {

int EventCallback(void* obj, xdag_event * eve);

void Start(String^ poolAddress);
void Start(String^ poolAddress, bool isTestnet);

bool HasExistingAccount();

Expand Down
6 changes: 3 additions & 3 deletions xDagWalletCLI/xdag_runtime.h
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ int xdag_event_callback(void* thisObj, xdag_event *event);


////---- Exporting functions ----
NATIVE_LIB_EXPORT int xdag_init_wrap(int argc, char **argv, const char * pool_address);
NATIVE_LIB_EXPORT int xdag_init_wrap(int argc, char **argv, const char * pool_address, bool is_test_net);
NATIVE_LIB_EXPORT int xdag_set_password_callback_wrap(int(*callback)(const char *prompt, char *buf, unsigned size));
NATIVE_LIB_EXPORT int xdag_set_event_callback_wrap(int(*callback)(void*, xdag_event *));
NATIVE_LIB_EXPORT int xdag_get_state_wrap(void);
Expand All @@ -69,7 +69,7 @@ NATIVE_LIB_EXPORT bool xdag_is_valid_remark(const char* remark);
extern pthread_t g_client_thread;
static int g_client_init_done = 0;
////---- Exporting functions wrapping functions ----
int xdag_init_wrap(int argc, char **argv, const char* pool_address)
int xdag_init_wrap(int argc, char **argv, const char* pool_address, bool is_test_net)
{
xdag_init_path(argv[0]);

Expand All @@ -79,7 +79,7 @@ int xdag_init_wrap(int argc, char **argv, const char* pool_address)

xdag_thread_param_t param;
strncpy(param.pool_arg, pool_address, 255);
param.testnet = 0;
param.testnet = is_test_net?1:0;

int err = pthread_create(&g_client_thread, 0, xdag_client_thread, (void*)&param);
if (err != 0) {
Expand Down
2 changes: 1 addition & 1 deletion xDagWalletWin/Properties/Strings.resx
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@
<value>Searching connection...</value>
</data>
<data name="LogonWindow_Title" xml:space="preserve">
<value>Welcome to XDAG Wallet (Version {0})</value>
<value>Welcome to XDAG Testnet-Wallet (Version {0})</value>
</data>
<data name="Common_ConfirmTitle" xml:space="preserve">
<value>Confirm</value>
Expand Down
4 changes: 2 additions & 2 deletions xDagWalletWin/Properties/Strings.zh.resx
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@
<value>正在查找网络连接...</value>
</data>
<data name="LogonWindow_Title" xml:space="preserve">
<value>欢迎使用XDAG钱包 (版本 {0})</value>
<value>欢迎使用XDAG测试网钱包 (版本 {0})</value>
</data>
<data name="Common_ConfirmTitle" xml:space="preserve">
<value>确认</value>
Expand Down Expand Up @@ -253,7 +253,7 @@
<value>状态:</value>
</data>
<data name="WalletWindow_Title" xml:space="preserve">
<value>XDAG 钱包账户</value>
<value>XDAG 测试网钱包账户</value>
</data>
<data name="WalletWindow_TransferTitle" xml:space="preserve">
<value>发起转账请求</value>
Expand Down
7 changes: 5 additions & 2 deletions xDagWalletWin/sources/UI/Windows/LogonWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,7 @@ private void RegisterAccount()
}

string poolAddress = walletConfig.Options.PoolAddress;
bool isTestnet = walletConfig.Options.IsTestNet;

PasswordWindow passwordWindow = new PasswordWindow(Properties.Strings.PasswordWindow_SetPassword, (passwordInput) =>
{
Expand Down Expand Up @@ -257,7 +258,7 @@ private void RegisterAccount()
ShowStatus(Properties.Strings.LogonWindow_InitializingAccount);
},
() => {
runtime.Start(poolAddress);
runtime.Start(poolAddress,isTestnet);

return 0;
},
Expand Down Expand Up @@ -294,6 +295,8 @@ private void ConnectAccount()
}

string poolAddress = walletConfig.Options.PoolAddress;
bool isTestnet = walletConfig.Options.IsTestNet;


PasswordWindow passwordWindow = new PasswordWindow(Properties.Strings.PasswordWindow_InputPassword, (passwordInput) =>
{
Expand All @@ -318,7 +321,7 @@ private void ConnectAccount()
},
() => {
logonStatus = LogonStatus.Connecting;
runtime.Start(poolAddress);
runtime.Start(poolAddress,isTestnet);

return 0;
},
Expand Down
2 changes: 1 addition & 1 deletion xDagWalletWin/wallet-config.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "0.3.1",
"version": "0.4.0",
"wallet_options": {
"pool_address": "de2.xdag.org:13655",
"rpc_enabled": false,
Expand Down