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
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ DEFINES += COIN_P2SH_VERSION=75
DEFINES += COIN_PREFIX_CONFIDENTIAL=4
DEFINES += HAVE_LIQUID
DEFINES += LIQUID_NET_REGTEST
DEFINES += COIN_COINID_SHORT=\"tL-BTC\"
DEFINES += COIN_COINID_SHORT=\"tLBTC\"
DEFINES += COIN_NATIVE_SEGWIT_PREFIX=\"ert\"
DEFINES += COIN_NATIVE_SEGWIT_PREFIX_CONFIDENTIAL=\"el\"

Expand All @@ -144,7 +144,7 @@ DEFINES += COIN_P2SH_VERSION=19
DEFINES += COIN_PREFIX_CONFIDENTIAL=23
DEFINES += HAVE_LIQUID
DEFINES += LIQUID_NET_TESTNET
DEFINES += COIN_COINID_SHORT=\"tL-BTC\"
DEFINES += COIN_COINID_SHORT=\"tLBTC\"
DEFINES += COIN_NATIVE_SEGWIT_PREFIX=\"tex\"
DEFINES += COIN_NATIVE_SEGWIT_PREFIX_CONFIDENTIAL=\"tlq\"

Expand All @@ -161,7 +161,7 @@ DEFINES += COIN_P2SH_VERSION=39
DEFINES += COIN_PREFIX_CONFIDENTIAL=12
DEFINES += HAVE_LIQUID
DEFINES += LIQUID_NET_MAINNET
DEFINES += COIN_COINID_SHORT=\"L-BTC\"
DEFINES += COIN_COINID_SHORT=\"LBTC\"
DEFINES += COIN_NATIVE_SEGWIT_PREFIX=\"ex\"
DEFINES += COIN_NATIVE_SEGWIT_PREFIX_CONFIDENTIAL=\"lq\"

Expand Down
16 changes: 8 additions & 8 deletions src/liquid/liquid_assets.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,22 +24,22 @@ STATIC_NO_TEST const asset_definition_t liquid_assets[] = {
{"LCAD", 8}},
{{0x14,0x4c,0x65,0x43,0x44,0xaa,0x71,0x6d,0x6f,0x3a,0xbc,0xc1,0xca,0x90,0xe5,0x64,
0x1e,0x4e,0x2a,0x7f,0x63,0x3b,0xc0,0x9f,0xe3,0xba,0xf6,0x45,0x85,0x81,0x9a,0x49},
{"tL-BTC", 8}}, // Liquid testnet
{"tLBTC", 8}}, // Liquid testnet
{{0x34,0x38,0xec,0xb4,0x9f,0xc4,0x5c,0x08,0xe6,0x87,0xde,0x47,0x49,0xed,0x62,0x8c,
0x51,0x1e,0x32,0x64,0x60,0xea,0x43,0x36,0x79,0x4e,0x1c,0xf0,0x27,0x41,0x32,0x9e},
{"JPYS", 0}},
{{0x5a,0xc9,0xf6,0x5c,0x0e,0xfc,0xc4,0x77,0x5e,0x0b,0xae,0xc4,0xec,0x03,0xab,0xdd,
0xe2,0x24,0x73,0xcd,0x3c,0xf3,0x3c,0x04,0x19,0xca,0x29,0x0e,0x07,0x51,0xb2,0x25},
{"tL-BTC", 8}}, // Liquid regtest
{"tLBTC", 8}}, // Liquid regtest
{{0x6f,0x02,0x79,0xe9,0xed,0x04,0x1c,0x3d,0x71,0x0a,0x9f,0x57,0xd0,0xc0,0x29,0x28,
0x41,0x64,0x60,0xc4,0xb7,0x22,0xae,0x34,0x57,0xa1,0x1e,0xec,0x38,0x1c,0x52,0x6d},
{"L-BTC", 8}}, // Liquid mainnet (liquidv1)
{"LBTC", 8}}, // Liquid mainnet (liquidv1)
{{0xb0,0x0b,0x0f,0xf0,0xb1,0x1e,0xbd,0x47,0xf7,0xc6,0xf5,0x76,0x14,0xc0,0x46,0xdb,
0xbd,0x20,0x4e,0x84,0xbf,0x01,0x17,0x8b,0xaf,0x2b,0xe3,0x71,0x3a,0x20,0x6e,0xb7},
{"BTSE", 8}},
{{0xb2,0xe1,0x5d,0x0d,0x7a,0x0c,0x94,0xe4,0xe2,0xce,0x0f,0xe6,0xe8,0x69,0x1b,0x9e,
0x45,0x13,0x77,0xf6,0xe4,0x6e,0x80,0x45,0xa8,0x6f,0x7c,0x4b,0x5d,0x4f,0x0f,0x23},
{"RL-BTC", 8}},
{"RLBTC", 8}},
{{0xce,0x09,0x1c,0x99,0x8b,0x83,0xc7,0x8b,0xb7,0x1a,0x63,0x23,0x13,0xba,0x37,0x60,
0xf1,0x76,0x3d,0x9c,0xfc,0xff,0xae,0x02,0x25,0x8f,0xfa,0x98,0x65,0xa3,0x7b,0xd2},
{"USDt", 8}},
Expand All @@ -58,20 +58,20 @@ STATIC_NO_TEST const asset_definition_t liquid_assets[] = {
/// Number of assets in list
#define N_LIQUID_ASSETS (sizeof(liquid_assets) / sizeof(liquid_assets[0]))

/// Asset tag of L-BTC or TL-BTC depending on build
/// Asset tag of LBTC or tLBTC depending on build
const uint8_t liquid_bitcoin_tag[LIQUID_ASSET_TAG_LEN] = {
#if defined(LIQUID_NET_REGTEST)
/// Asset tag of regtest TL-BTC
/// Asset tag of regtest tLBTC
0x5a, 0xc9, 0xf6, 0x5c, 0x0e, 0xfc, 0xc4, 0x77, 0x5e, 0x0b, 0xae,
0xc4, 0xec, 0x03, 0xab, 0xdd, 0xe2, 0x24, 0x73, 0xcd, 0x3c, 0xf3,
0x3c, 0x04, 0x19, 0xca, 0x29, 0x0e, 0x07, 0x51, 0xb2, 0x25
#elif defined(LIQUID_NET_TESTNET)
/// Asset tag of testnet TL-BTC
/// Asset tag of testnet tLBTC
0x14, 0x4c, 0x65, 0x43, 0x44, 0xaa, 0x71, 0x6d, 0x6f, 0x3a, 0xbc,
0xc1, 0xca, 0x90, 0xe5, 0x64, 0x1e, 0x4e, 0x2a, 0x7f, 0x63, 0x3b,
0xc0, 0x9f, 0xe3, 0xba, 0xf6, 0x45, 0x85, 0x81, 0x9a, 0x49
#elif defined(LIQUID_NET_MAINNET)
/// Asset tag of L-BTC
/// Asset tag of LBTC
0x6f, 0x02, 0x79, 0xe9, 0xed, 0x04, 0x1c, 0x3d, 0x71, 0x0a, 0x9f,
0x57, 0xd0, 0xc0, 0x29, 0x28, 0x41, 0x64, 0x60, 0xc4, 0xb7, 0x22,
0xae, 0x34, 0x57, 0xa1, 0x1e, 0xec, 0x38, 0x1c, 0x52, 0x6d
Expand Down
4 changes: 2 additions & 2 deletions src/liquid/liquid_assets.h
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ typedef struct {
uint8_t write_idx;
} asset_cache_t;

/// Asset tag of L-BTC or TL-BTC depending on build
/// Asset tag of LBTC or tLBTC depending on build
extern const uint8_t liquid_bitcoin_tag[LIQUID_ASSET_TAG_LEN];

/**
Expand All @@ -86,7 +86,7 @@ extern const uint8_t liquid_bitcoin_tag[LIQUID_ASSET_TAG_LEN];
const asset_info_t *liquid_get_asset_info(const uint8_t tag[static LIQUID_ASSET_TAG_LEN]);

/**
* Checks wether the given asset tag corresponds to L-BTC (or TL-BTC for tentnet build)
* Checks wether the given asset tag corresponds to LBTC (or tLBTC for tentnet build)
*
* @param[in] tag asset tag for look-up
* @return true
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Diff not rendered.
Loading