testnet10 release

madMAx43v3r · Apr 24, 2023 · b7a879b · b7a879b
1 parent c75a120
commit b7a879b
Show file tree

Hide file tree

Showing 40 changed files with 339 additions and 116 deletions.
diff --git a/mmx-node/linux/x86_64/activate.sh b/mmx-node/linux/x86_64/activate.sh
@@ -28,7 +28,7 @@ cp "${PASSWD_PATH}" "${MMX_HOME}PASSWD"
 if [ -f "${MMX_HOME}NETWORK" ]; then
 	NETWORK=$(cat "${MMX_HOME}NETWORK")
 else
-	NETWORK=testnet9
+	NETWORK=testnet10
 	echo ${NETWORK} > "${MMX_HOME}NETWORK"
 fi
 

diff --git a/mmx-node/linux/x86_64/bin/calc_test_rewards b/mmx-node/linux/x86_64/bin/calc_test_rewards
diff --git a/mmx-node/linux/x86_64/bin/dump_binary b/mmx-node/linux/x86_64/bin/dump_binary
diff --git a/mmx-node/linux/x86_64/bin/mmx b/mmx-node/linux/x86_64/bin/mmx
diff --git a/mmx-node/linux/x86_64/bin/mmx_compile b/mmx-node/linux/x86_64/bin/mmx_compile
diff --git a/mmx-node/linux/x86_64/bin/mmx_farmer b/mmx-node/linux/x86_64/bin/mmx_farmer
diff --git a/mmx-node/linux/x86_64/bin/mmx_harvester b/mmx-node/linux/x86_64/bin/mmx_harvester
diff --git a/mmx-node/linux/x86_64/bin/mmx_node b/mmx-node/linux/x86_64/bin/mmx_node
diff --git a/mmx-node/linux/x86_64/bin/mmx_timelord b/mmx-node/linux/x86_64/bin/mmx_timelord
diff --git a/mmx-node/linux/x86_64/bin/mmx_wallet b/mmx-node/linux/x86_64/bin/mmx_wallet
diff --git a/mmx-node/linux/x86_64/bin/tx_bench b/mmx-node/linux/x86_64/bin/tx_bench
diff --git a/mmx-node/linux/x86_64/config/default/chain/params/offer_binary b/mmx-node/linux/x86_64/config/default/chain/params/offer_binary
@@ -1 +1 @@
-mmx18prt3g38ws4hjh59y3xq0znsa0nst69l9pyr5et6dpdvg8mfnfps8cssqx
+mmx10xg2w2y3wf0l2ttt98en28jjsfqzrz4er76ydvp9kx00n5tts2dszc9rpk
diff --git a/mmx-node/linux/x86_64/config/default/chain/params/plot_binary b/mmx-node/linux/x86_64/config/default/chain/params/plot_binary
@@ -1 +1 @@
-mmx1ct5evvlq2delu7vnlmeu838chnwycdcq3wuujkckkcjcet0ealuqeajrl5
+mmx1q3z9ln6tx69w7a57uamhywangz7x0lsc7ptrmnh22qj3k64q06pqzpzr4q
diff --git a/mmx-node/linux/x86_64/config/default/chain/params/plot_nft_binary b/mmx-node/linux/x86_64/config/default/chain/params/plot_nft_binary
@@ -0,0 +1 @@
+mmx1xerme3ngua7y5ljmavw6s500umv4jnudn66cukkp7q0grjwch6uqcyz4fy
diff --git a/mmx-node/linux/x86_64/config/default/chain/params/swap_binary b/mmx-node/linux/x86_64/config/default/chain/params/swap_binary
@@ -1 +1 @@
-mmx183fcx8p7fntt0uj0n60dstk9u3p32y6smvl9v2n0ahsjcwfuccnqdfar8m
+mmx1hfyq6t2jartw9f8fkkertepxef0f8egegd3m438ndfttrlhzzmks7c99tv
diff --git a/mmx-node/linux/x86_64/config/default/chain/params/token_binary b/mmx-node/linux/x86_64/config/default/chain/params/token_binary
@@ -0,0 +1 @@
+mmx1rnang04sx9srtf8kxzkyrn6mj6wcgwjjmthwmflvaxpnds9ev7eqdug0ag
diff --git a/mmx-node/linux/x86_64/config/testnet10/Router.json b/mmx-node/linux/x86_64/config/testnet10/Router.json
@@ -0,0 +1,7 @@
+{
+	"seed_peers": [
+		"5.9.65.85",
+		"5.9.65.10",
+		"65.108.224.248",
+	]
+}
diff --git a/mmx-node/linux/x86_64/config/testnet10/Wallet.json b/mmx-node/linux/x86_64/config/testnet10/Wallet.json
@@ -0,0 +1,5 @@
+{
+	"token_whitelist": [
+		"mmx1m8qs007sgerhy69zcd98pfdnj3466q24ff9alphmc5nxjwvjules8nh77l"
+	]
+}
diff --git a/mmx-node/linux/x86_64/config/testnet10/chain/params.json b/mmx-node/linux/x86_64/config/testnet10/chain/params.json
@@ -0,0 +1,42 @@
+{
+	"port": 12340,
+	"block_time": 10,
+	"plot_filter": 8,
+	"plot_filter_nhash": 64,
+	"min_ksize": 26,
+	"infuse_delay": 3,
+	"challenge_delay": 6,
+	"challenge_interval": 64,
+	"commit_delay": 24,
+	"min_vdf_segments": 1000,
+	"num_vdf_segments": 1150,
+	"max_vdf_segments": 2048,
+	"vdf_seed": "test10",
+	"reward_factor": {
+		"value": 3048,
+		"inverse": 1000000000000000
+	},
+	"vdf_reward": 2500,
+	"min_reward": 500000,
+	"min_txfee": 2000,
+	"min_txfee_io": 1000,
+	"min_txfee_sign": 1000,
+	"min_txfee_exec": 2000,
+	"min_txfee_deploy": 2000,
+	"min_txfee_byte": 10,
+	"min_txfee_activate": 10000,
+	"max_block_size": 10000000,
+	"max_block_cost": 200000000,
+	"min_time_diff": 100000,
+	"initial_time_diff": 200000,
+	"initial_space_diff": 1,
+	"time_diff_constant": 1000,
+	"space_diff_constant": 100000000,
+	"virtual_space_constant": 1524,
+	"fixed_project_reward": 50000,
+	"project_ratio": {
+		"value": 1,
+		"inverse": 100
+	},
+	"project_addr": "mmx1cvc060jcsk3ywg36c5sm7zmrgth0ex7wp9s7jxvh4kgjgy2c90ss46rhwp"
+}
diff --git a/mmx-node/linux/x86_64/config/testnet10/parent b/mmx-node/linux/x86_64/config/testnet10/parent
@@ -0,0 +1 @@
+../default/
diff --git a/mmx-node/linux/x86_64/data/tx_offer_binary.dat b/mmx-node/linux/x86_64/data/tx_offer_binary.dat
diff --git a/mmx-node/linux/x86_64/data/tx_plot_binary.dat b/mmx-node/linux/x86_64/data/tx_plot_binary.dat
diff --git a/mmx-node/linux/x86_64/data/tx_plot_nft_binary.dat b/mmx-node/linux/x86_64/data/tx_plot_nft_binary.dat
diff --git a/mmx-node/linux/x86_64/data/tx_swap_binary.dat b/mmx-node/linux/x86_64/data/tx_swap_binary.dat
diff --git a/mmx-node/linux/x86_64/data/tx_token_binary.dat b/mmx-node/linux/x86_64/data/tx_token_binary.dat
diff --git a/mmx-node/linux/x86_64/include/vnx/Util.h b/mmx-node/linux/x86_64/include/vnx/Util.h
@@ -91,6 +91,9 @@ uint64_t rand64();
 /// Converts a binary string to a hex string, with constant length. (Without leading "0x")
 std::string to_hex_string(const void* data, const size_t length, bool big_endian = false, bool lower_case = false);
 
+/// Converts a hex string to binary vector. (Handles leading "0x")
+std::vector<uint8_t> from_hex_string(const std::string& str);
+
 /// Converts an integer to a hex string (big endian), without leading zeros. (Without leading "0x", upper case chars)
 template<typename T>
 std::string to_hex_string(const T& value) {
@@ -128,6 +131,9 @@ std::string get_socket_error_text();
 /// Get this machines host name
 std::string get_host_name();
 
+/// Get peer address for socket
+std::string get_peer_address(int sock);
+
 
 } // vnx
 

diff --git a/mmx-node/linux/x86_64/lib/libmmx_iface.so b/mmx-node/linux/x86_64/lib/libmmx_iface.so
diff --git a/mmx-node/linux/x86_64/lib/libmmx_modules.so b/mmx-node/linux/x86_64/lib/libmmx_modules.so
diff --git a/mmx-node/linux/x86_64/lib/libmmx_vm.so b/mmx-node/linux/x86_64/lib/libmmx_vm.so
diff --git a/mmx-node/linux/x86_64/lib/libvnx_addons.so b/mmx-node/linux/x86_64/lib/libvnx_addons.so
diff --git a/mmx-node/linux/x86_64/lib/libvnx_base.so b/mmx-node/linux/x86_64/lib/libvnx_base.so
diff --git a/mmx-node/linux/x86_64/scripts/genesis_setup.sh b/mmx-node/linux/x86_64/scripts/genesis_setup.sh
@@ -1,3 +1,7 @@
-./build/create_plot_binary > config/default/chain/params/plot_binary
-./build/create_offer_binary > config/default/chain/params/offer_binary
-./build/create_swap_binary > config/default/chain/params/swap_binary
+#!/bin/bash
+
+./build/tools/mmx_compile -f src/contract/swap.js -t -o data/tx_swap_binary.dat > config/default/chain/params/swap_binary
+./build/tools/mmx_compile -f src/contract/offer.js -t -o data/tx_offer_binary.dat > config/default/chain/params/offer_binary
+./build/tools/mmx_compile -f src/contract/token.js -t -o data/tx_token_binary.dat > config/default/chain/params/token_binary
+./build/tools/mmx_compile -f src/contract/virtual_plot.js -t -o data/tx_plot_binary.dat > config/default/chain/params/plot_binary
+./build/tools/mmx_compile -f src/contract/plot_nft.js -t -o data/tx_plot_nft_binary.dat > config/default/chain/params/plot_nft_binary
diff --git a/mmx-node/linux/x86_64/scripts/win/activate.cmd b/mmx-node/linux/x86_64/scripts/win/activate.cmd
@@ -14,7 +14,7 @@ IF "%MMX_DATA%"=="" (
 	SET "MMX_DATA=%MMX_HOME%"
 )
 
-SET "NETWORK=testnet9"
+SET "NETWORK=testnet10"
 SET "MMX_NETWORK=%MMX_DATA%%NETWORK%\"
 
 ECHO NETWORK=%NETWORK%

diff --git a/mmx-node/linux/x86_64/www/web-gui/public/GIT_COMMIT_HASH.json b/mmx-node/linux/x86_64/www/web-gui/public/GIT_COMMIT_HASH.json
@@ -1 +1 @@
-{ "GIT_COMMIT_HASH": "254ebfde602ad099efe5623b4230ee15c7f41c68" }
+{ "GIT_COMMIT_HASH": "d10340e13a7e63c8d94417e606338280b3ad5d3b" }
diff --git a/mmx-node/linux/x86_64/www/web-gui/public/explorer.js b/mmx-node/linux/x86_64/www/web-gui/public/explorer.js
@@ -99,7 +99,7 @@ Vue.component('blocks-table', {
 			</template>
 
 			<template v-slot:item.reward="{ item }">
-				{{item.tx_base && item.tx_base.exec_result ? (item.tx_base.exec_result.total_fee_value).toFixed(3) + "&nbsp;&nbsp;MMX" : null}}
+				{{item.reward_addr ? (item.reward_amount.value).toFixed(3) + "&nbsp;&nbsp;MMX" : null}}
 			</template>
 			
 			<template v-slot:item.static_cost_ratio="{ item }">
@@ -418,10 +418,18 @@ Vue.component('block-view', {
 										<td class="key-cell">{{ $t('block_view.vdf_iterations') }}</td>
 										<td>{{data.vdf_iters}}</td>
 									</tr>
-									<template v-if="data.tx_base">
+									<tr>
+										<td class="key-cell">Timelord</td>
+										<td><router-link :to="'/explore/address/' + data.vdf_reward">{{data.vdf_reward}}</router-link></td>
+									</tr>
+									<template v-if="data.reward_addr">
+										<tr>
+											<td class="key-cell">Farmer Address</td>
+											<td><router-link :to="'/explore/address/' + data.reward_addr">{{data.reward_addr}}</router-link></td>
+										</tr>
 										<tr>
-											<td class="key-cell">{{ $t('block_view.tx_base') }}</td>
-											<td><router-link :to="'/explore/transaction/' + data.tx_base.id">{{data.tx_base.id}}</router-link></td>
+											<td class="key-cell">Block Reward</td>
+											<td>{{data.reward_amount.value}}&nbsp;&nbsp;<b>MMX</b></td>
 										</tr>
 									</template>
 									<template v-if="data.proof">

diff --git a/mmx-node/linux/x86_64/www/web-gui/public/index.js b/mmx-node/linux/x86_64/www/web-gui/public/index.js
@@ -267,6 +267,15 @@ const SwapLiquid = {
 		`
 }
 
+const SwapPool = {
+	props: {
+		address: null
+	},
+	template: `
+		<swap-pool-info :address="address"></swap-pool-info>
+		`
+}
+
 const Explore = {
 	template: `
 		<div>

diff --git a/mmx-node/linux/x86_64/www/web-gui/public/mount.js b/mmx-node/linux/x86_64/www/web-gui/public/mount.js
@@ -53,6 +53,7 @@ const routes = [
 			{ path: 'trade/:address', component: SwapTrade, meta: { page: 'trade' } },
 			{ path: 'history/:address', component: SwapHistory, meta: { page: 'history' } },
 			{ path: 'liquid/:address', component: SwapLiquid, meta: { page: 'liquid' } },
+			{ path: 'pool/:address', component: SwapPool, meta: { page: 'pool' } },
 		]
 	},
 	{ path: '/explore',

diff --git a/mmx-node/linux/x86_64/www/web-gui/public/node.js b/mmx-node/linux/x86_64/www/web-gui/public/node.js
@@ -51,8 +51,8 @@ Vue.component('node-info', {
 									</v-row>
 								</v-col>
 
-								<v-col cols="12" xl="3" md="3" sm="6" class="text-center my-2">					
-									<v-row align="center" justify="space-around" width=100>									
+								<v-col cols="12" xl="3" md="3" sm="6" class="text-center my-2">
+									<v-row align="center" justify="space-around" width=100>
 										<div v-if="data">{{ data.height }}</div>
 										<v-skeleton-loader v-else type="heading" width="50%" align="center"/>
 									</v-row>
@@ -73,11 +73,11 @@ Vue.component('node-info', {
 
 								<v-col cols="12" xl="3" md="3" sm="6" class="text-center my-2">					
 									<v-row align="center" justify="space-around">
-										<div v-if="data">{{ (data.total_supply / Math.pow(10, 6)).toFixed(0) }} MMX</div>
+										<div v-if="data">{{ data.vdf_speed.toFixed(3) }} MH/s</div>
 										<v-skeleton-loader v-else type="heading" width="50%" align="center"/>
 									</v-row>
 									<v-row align="center" justify="space-around" class="subtitle-1">
-										{{ $t('node_info.supply') }}
+										{{ $t('node_info.vdf_speed') }}
 									</v-row>
 								</v-col>
 
@@ -115,11 +115,11 @@ Vue.component('node-info', {
 
 								<v-col cols="12" xl="3" md="3" sm="6" class="text-center my-2">					
 									<v-row align="center" justify="space-around">
-										<div v-if="data">{{ (data.time_diff / 10 / Math.pow(10, 3)).toFixed(3) }} MH/s</div>
+										<div v-if="data">{{ data.average_txfee.value > 1 ? data.average_txfee.value.toPrecision(6) : data.average_txfee.value }} MMX</div>
 										<v-skeleton-loader v-else type="heading" width="50%" align="center"/>
 									</v-row>
 									<v-row align="center" justify="space-around" class="subtitle-1">
-										{{ $t('node_info.vdf_speed') }}
+										Avg. TX Fee
 									</v-row>
 								</v-col>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		mmx18prt3g38ws4hjh59y3xq0znsa0nst69l9pyr5et6dpdvg8mfnfps8cssqx
		mmx10xg2w2y3wf0l2ttt98en28jjsfqzrz4er76ydvp9kx00n5tts2dszc9rpk
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		mmx1ct5evvlq2delu7vnlmeu838chnwycdcq3wuujkckkcjcet0ealuqeajrl5
		mmx1q3z9ln6tx69w7a57uamhywangz7x0lsc7ptrmnh22qj3k64q06pqzpzr4q
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		mmx1xerme3ngua7y5ljmavw6s500umv4jnudn66cukkp7q0grjwch6uqcyz4fy
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		mmx183fcx8p7fntt0uj0n60dstk9u3p32y6smvl9v2n0ahsjcwfuccnqdfar8m
		mmx1hfyq6t2jartw9f8fkkertepxef0f8egegd3m438ndfttrlhzzmks7c99tv
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		mmx1rnang04sx9srtf8kxzkyrn6mj6wcgwjjmthwmflvaxpnds9ev7eqdug0ag
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{ "GIT_COMMIT_HASH": "254ebfde602ad099efe5623b4230ee15c7f41c68" }
		{ "GIT_COMMIT_HASH": "d10340e13a7e63c8d94417e606338280b3ad5d3b" }