Merge branch 'master' into zomp

This commit is contained in:
Craig Everett 2024-11-01 13:28:00 +09:00
commit 670fe59a21
2 changed files with 13 additions and 0 deletions

View File

@ -25,6 +25,7 @@
| contract_pubkey | contract_pubkey
| contract_store_key | contract_store_key
| contract_store_value | contract_store_value
| contract_source
| transaction | transaction
| tx_hash | tx_hash
| oracle_pubkey | oracle_pubkey
@ -172,6 +173,7 @@ id2type(associate_chain) -> associate_chain;
id2type(channel) -> channel; id2type(channel) -> channel;
id2type(commitment) -> commitment; id2type(commitment) -> commitment;
id2type(contract) -> contract_pubkey; id2type(contract) -> contract_pubkey;
id2type(contract_source) -> contract_source;
id2type(name) -> name; id2type(name) -> name;
id2type(native_token) -> native_token; id2type(native_token) -> native_token;
id2type(entry) -> entry; id2type(entry) -> entry;
@ -182,6 +184,7 @@ type2id(associate_chain) -> associate_chain;
type2id(channel) -> channel; type2id(channel) -> channel;
type2id(commitment) -> commitment; type2id(commitment) -> commitment;
type2id(contract_pubkey) -> contract; type2id(contract_pubkey) -> contract;
type2id(contract_source) -> contract_source;
type2id(name) -> name; type2id(name) -> name;
type2id(native_token) -> native_token; type2id(native_token) -> native_token;
type2id(entry) -> entry; type2id(entry) -> entry;
@ -198,6 +201,7 @@ type2enc(contract_pubkey) -> ?BASE58;
type2enc(contract_bytearray) -> ?BASE64; type2enc(contract_bytearray) -> ?BASE64;
type2enc(contract_store_key) -> ?BASE64; type2enc(contract_store_key) -> ?BASE64;
type2enc(contract_store_value) -> ?BASE64; type2enc(contract_store_value) -> ?BASE64;
type2enc(contract_source) -> ?BASE64;
type2enc(transaction) -> ?BASE64; type2enc(transaction) -> ?BASE64;
type2enc(tx_hash) -> ?BASE58; type2enc(tx_hash) -> ?BASE58;
type2enc(oracle_pubkey) -> ?BASE58; type2enc(oracle_pubkey) -> ?BASE58;
@ -233,6 +237,7 @@ type2pfx(contract_pubkey) -> <<"ct">>;
type2pfx(contract_bytearray) -> <<"cb">>; type2pfx(contract_bytearray) -> <<"cb">>;
type2pfx(contract_store_key) -> <<"ck">>; type2pfx(contract_store_key) -> <<"ck">>;
type2pfx(contract_store_value) -> <<"cv">>; type2pfx(contract_store_value) -> <<"cv">>;
type2pfx(contract_source) -> <<"cx">>;
type2pfx(transaction) -> <<"tx">>; type2pfx(transaction) -> <<"tx">>;
type2pfx(tx_hash) -> <<"th">>; type2pfx(tx_hash) -> <<"th">>;
type2pfx(oracle_pubkey) -> <<"ok">>; type2pfx(oracle_pubkey) -> <<"ok">>;
@ -267,6 +272,7 @@ pfx2type(<<"cb">>) -> contract_bytearray;
pfx2type(<<"ck">>) -> contract_store_key; pfx2type(<<"ck">>) -> contract_store_key;
pfx2type(<<"cv">>) -> contract_store_value; pfx2type(<<"cv">>) -> contract_store_value;
pfx2type(<<"ct">>) -> contract_pubkey; pfx2type(<<"ct">>) -> contract_pubkey;
pfx2type(<<"cx">>) -> contract_source;
pfx2type(<<"tx">>) -> transaction; pfx2type(<<"tx">>) -> transaction;
pfx2type(<<"th">>) -> tx_hash; pfx2type(<<"th">>) -> tx_hash;
pfx2type(<<"ok">>) -> oracle_pubkey; pfx2type(<<"ok">>) -> oracle_pubkey;
@ -303,6 +309,7 @@ byte_size_for_type(contract_pubkey) -> 32;
byte_size_for_type(contract_bytearray) -> not_applicable; byte_size_for_type(contract_bytearray) -> not_applicable;
byte_size_for_type(contract_store_key) -> not_applicable; byte_size_for_type(contract_store_key) -> not_applicable;
byte_size_for_type(contract_store_value) -> not_applicable; byte_size_for_type(contract_store_value) -> not_applicable;
byte_size_for_type(contract_source) -> not_applicable;
byte_size_for_type(transaction) -> not_applicable; byte_size_for_type(transaction) -> not_applicable;
byte_size_for_type(tx_hash) -> 32; byte_size_for_type(tx_hash) -> 32;
byte_size_for_type(oracle_pubkey) -> 32; byte_size_for_type(oracle_pubkey) -> 32;

View File

@ -40,6 +40,7 @@ deserialize(Type, Vsn, Template, Binary) ->
tag(account) -> 10; tag(account) -> 10;
tag(signed_tx) -> 11; tag(signed_tx) -> 11;
tag(spend_tx) -> 12; tag(spend_tx) -> 12;
tag(data_extend_tx) -> 13;
tag(oracle) -> 20; tag(oracle) -> 20;
tag(oracle_query) -> 21; tag(oracle_query) -> 21;
tag(oracle_register_tx) -> 22; tag(oracle_register_tx) -> 22;
@ -58,8 +59,10 @@ tag(contract) -> 40;
tag(contract_call) -> 41; tag(contract_call) -> 41;
tag(contract_create_tx) -> 42; tag(contract_create_tx) -> 42;
tag(contract_call_tx) -> 43; tag(contract_call_tx) -> 43;
tag(contract_source) -> 44;
tag(channel_create_tx) -> 50; tag(channel_create_tx) -> 50;
tag(channel_set_delegates_tx) -> 501; tag(channel_set_delegates_tx) -> 501;
tag(channel_delegates) -> 502;
tag(channel_deposit_tx) -> 51; tag(channel_deposit_tx) -> 51;
tag(channel_withdraw_tx) -> 52; tag(channel_withdraw_tx) -> 52;
tag(channel_force_progress_tx) -> 521; tag(channel_force_progress_tx) -> 521;
@ -122,6 +125,7 @@ tag(pof) -> 200.
rev_tag(10) -> account; rev_tag(10) -> account;
rev_tag(11) -> signed_tx; rev_tag(11) -> signed_tx;
rev_tag(12) -> spend_tx; rev_tag(12) -> spend_tx;
rev_tag(13) -> data_extend_tx;
rev_tag(20) -> oracle; rev_tag(20) -> oracle;
rev_tag(21) -> oracle_query; rev_tag(21) -> oracle_query;
rev_tag(22) -> oracle_register_tx; rev_tag(22) -> oracle_register_tx;
@ -140,8 +144,10 @@ rev_tag(40) -> contract;
rev_tag(41) -> contract_call; rev_tag(41) -> contract_call;
rev_tag(42) -> contract_create_tx; rev_tag(42) -> contract_create_tx;
rev_tag(43) -> contract_call_tx; rev_tag(43) -> contract_call_tx;
rev_tag(44) -> contract_source;
rev_tag(50) -> channel_create_tx; rev_tag(50) -> channel_create_tx;
rev_tag(501) -> channel_set_delegates_tx; rev_tag(501) -> channel_set_delegates_tx;
rev_tag(502) -> channel_delegates;
rev_tag(51) -> channel_deposit_tx; rev_tag(51) -> channel_deposit_tx;
rev_tag(52) -> channel_withdraw_tx; rev_tag(52) -> channel_withdraw_tx;
rev_tag(521) -> channel_force_progress_tx; rev_tag(521) -> channel_force_progress_tx;