diff --git a/Docker/Dockerfile b/Docker/Dockerfile index 50d7e1c61..c09dc026f 100644 --- a/Docker/Dockerfile +++ b/Docker/Dockerfile @@ -18,7 +18,15 @@ RUN cd cyberway.contracts \ -DCMAKE_INSTALL_PREFIX=/opt/cyberway.contracts/ \ -Dcyberway.cdt_DIR=/opt/cyberway.cdt/lib/cmake/cyberway.cdt \ -DEOSIO_ROOT=/opt/cyberway \ - && cmake --build build --target install + && cmake --build build --target install \ + && /opt/cyberway.cdt/bin/cyberway-abidiff /opt/cyberway.contracts/cyber.token/cyber.token.abi ./cyber.token/abi/cyber.token.abi \ + && /opt/cyberway.cdt/bin/cyberway-abidiff /opt/cyberway.contracts/cyber.govern/cyber.govern.abi ./cyber.govern/abi/cyber.govern.abi \ + && /opt/cyberway.cdt/bin/cyberway-abidiff /opt/cyberway.contracts/cyber.msig/cyber.msig.abi ./cyber.msig/abi/cyber.msig.abi \ + && /opt/cyberway.cdt/bin/cyberway-abidiff /opt/cyberway.contracts/cyber.rejector/cyber.rejector.abi ./cyber.rejector/abi/cyber.rejector.abi \ + && /opt/cyberway.cdt/bin/cyberway-abidiff /opt/cyberway.contracts/cyber.incomereject/cyber.incomereject.abi ./cyber.incomereject/abi/cyber.incomereject.abi \ + && /opt/cyberway.cdt/bin/cyberway-abidiff /opt/cyberway.contracts/cyber.bios/cyber.bios.abi ./cyber.bios/abi/cyber.bios.abi \ + && /opt/cyberway.cdt/bin/cyberway-abidiff /opt/cyberway.contracts/cyber.domain/cyber.domain.abi ./cyber.domain/cyber.domain.abi \ + && echo "abidiff check passed" FROM ubuntu:18.04 diff --git a/cyber.bios/abi/cyber.bios.abi b/cyber.bios/abi/cyber.bios.abi index 3387c9679..7e5e9eeec 100644 --- a/cyber.bios/abi/cyber.bios.abi +++ b/cyber.bios/abi/cyber.bios.abi @@ -149,6 +149,344 @@ "fields": [ {"type": "name", "name": "bidder"} ] + }, + { + "name": "newaccount", + "base": "", + "fields": [ + { + "name": "creator", + "type": "name" + }, + { + "name": "name", + "type": "name" + }, + { + "name": "owner", + "type": "authority" + }, + { + "name": "active", + "type": "authority" + } + ] + }, + { + "name": "updateauth", + "base": "", + "fields": [ + { + "name": "account", + "type": "name" + }, + { + "name": "permission", + "type": "name" + }, + { + "name": "parent", + "type": "name" + }, + { + "name": "auth", + "type": "authority" + } + ] + }, + { + "name": "deleteauth", + "base": "", + "fields": [ + { + "name": "account", + "type": "name" + }, + { + "name": "permission", + "type": "name" + } + ] + }, + { + "name": "linkauth", + "base": "", + "fields": [ + { + "name": "account", + "type": "name" + }, + { + "name": "code", + "type": "name" + }, + { + "name": "type", + "type": "name" + }, + { + "name": "requirement", + "type": "name" + } + ] + }, + { + "name": "unlinkauth", + "base": "", + "fields": [ + { + "name": "account", + "type": "name" + }, + { + "name": "code", + "type": "name" + }, + { + "name": "type", + "type": "name" + } + ] + }, + { + "name": "canceldelay", + "base": "", + "fields": [ + { + "name": "canceling_auth", + "type": "permission_level" + }, + { + "name": "trx_id", + "type": "checksum256" + } + ] + }, + { + "name": "onerror", + "base": "", + "fields": [ + { + "name": "sender_id", + "type": "uint128" + }, + { + "name": "sent_trx", + "type": "bytes" + } + ] + }, + { + "name": "setcode", + "base": "", + "fields": [ + { + "name": "account", + "type": "name" + }, + { + "name": "vmtype", + "type": "uint8" + }, + { + "name": "vmversion", + "type": "uint8" + }, + { + "name": "code", + "type": "bytes" + } + ] + }, + { + "name": "blockchain_parameters", + "base": "", + "fields": [ + { + "name": "base_per_transaction_net_usage", + "type": "uint32" + }, + { + "name": "context_free_discount_net_usage_num", + "type": "uint32" + }, + { + "name": "context_free_discount_net_usage_den", + "type": "uint32" + }, + { + "name": "min_transaction_cpu_usage", + "type": "uint32" + }, + { + "name": "min_transaction_ram_usage", + "type": "uint64" + }, + { + "name": "max_transaction_lifetime", + "type": "uint32" + }, + { + "name": "deferred_trx_expiration_window", + "type": "uint32" + }, + { + "name": "max_transaction_delay", + "type": "uint32" + }, + { + "name": "max_inline_action_size", + "type": "uint32" + }, + { + "name": "max_inline_action_depth", + "type": "uint16" + }, + { + "name": "max_authority_depth", + "type": "uint16" + }, + { + "name": "ram_size", + "type": "uint64" + }, + { + "name": "reserved_ram_size", + "type": "uint64" + }, + { + "name": "max_block_usage", + "type": "uint64[]" + }, + { + "name": "max_transaction_usage", + "type": "uint64[]" + }, + { + "name": "target_virtual_limits", + "type": "uint64[]" + }, + { + "name": "min_virtual_limits", + "type": "uint64[]" + }, + { + "name": "max_virtual_limits", + "type": "uint64[]" + }, + { + "name": "usage_windows", + "type": "uint32[]" + }, + { + "name": "virtual_limit_decrease_pct", + "type": "uint16[]" + }, + { + "name": "virtual_limit_increase_pct", + "type": "uint16[]" + }, + { + "name": "account_usage_windows", + "type": "uint32[]" + } + ] + }, + { + "name": "setparams", + "base": "", + "fields": [ + { + "name": "params", + "type": "blockchain_parameters" + } + ] + }, + { + "name": "reqauth", + "base": "", + "fields": [ + { + "name": "from", + "type": "name" + } + ] + }, + { + "name": "setabi", + "base": "", + "fields": [ + { + "name": "account", + "type": "name" + }, + { + "name": "abi", + "type": "bytes" + } + ] + }, + { + "name": "producer_schedule", + "base": "", + "fields": [ + { + "name": "version", + "type": "uint32" + }, + { + "name": "producers", + "type": "producer_key[]" + } + ] + }, + { + "name": "block_header", + "base": "", + "fields": [ + { + "name": "timestamp", + "type": "uint32" + }, + { + "name": "producer", + "type": "name" + }, + { + "name": "confirmed", + "type": "uint16" + }, + { + "name": "previous", + "type": "checksum256" + }, + { + "name": "transaction_mroot", + "type": "checksum256" + }, + { + "name": "action_mroot", + "type": "checksum256" + }, + { + "name": "schedule_version", + "type": "uint32" + }, + { + "name": "new_producers", + "type": "producer_schedule?" + } + ] + }, + { + "name": "onblock", + "base": "", + "fields": [ + { + "name": "header", + "type": "block_header" + } + ] } ], "types": [], @@ -168,6 +506,54 @@ { "name": "bidrefund", "type": "bidrefund" + }, + { + "name": "newaccount", + "type": "newaccount" + }, + { + "name": "updateauth", + "type": "updateauth" + }, + { + "name": "deleteauth", + "type": "deleteauth" + }, + { + "name": "linkauth", + "type": "linkauth" + }, + { + "name": "unlinkauth", + "type": "unlinkauth" + }, + { + "name": "canceldelay", + "type": "canceldelay" + }, + { + "name": "onerror", + "type": "onerror" + }, + { + "name": "setcode", + "type": "setcode" + }, + { + "name": "setparams", + "type": "setparams" + }, + { + "name": "reqauth", + "type": "reqauth" + }, + { + "name": "setabi", + "type": "setabi" + }, + { + "name": "onblock", + "type": "onblock" } ], "tables": [ @@ -198,6 +584,7 @@ }] } ], + "events": [], "variants": [], "abi_extensions": [] } diff --git a/cyber.domain/cyber.domain.abi b/cyber.domain/cyber.domain.abi index ab216f950..e72008f60 100644 --- a/cyber.domain/cyber.domain.abi +++ b/cyber.domain/cyber.domain.abi @@ -180,6 +180,7 @@ }] } ], + "events": [], "variants": [], "abi_extensions": [] } \ No newline at end of file diff --git a/cyber.msig/abi/cyber.msig.abi b/cyber.msig/abi/cyber.msig.abi index 455f813b3..80318d5d9 100644 --- a/cyber.msig/abi/cyber.msig.abi +++ b/cyber.msig/abi/cyber.msig.abi @@ -379,6 +379,7 @@ ] } ], + "events": [], "variants": [], "abi_extensions": [] } diff --git a/cyber.stake/abi/cyber.stake.abi b/cyber.stake/abi/cyber.stake.abi index 18e46e20b..a26e064c5 100644 --- a/cyber.stake/abi/cyber.stake.abi +++ b/cyber.stake/abi/cyber.stake.abi @@ -23,7 +23,7 @@ {"name":"date", "type":"time_point_sec"} ] },{ - "name": "create_args", + "name": "create", "base": "", "fields": [ { "type": "symbol", "name": "token_symbol" }, @@ -32,7 +32,7 @@ { "type": "int64", "name": "min_own_staked_for_election" } ] },{ - "name": "open_args", + "name": "open", "base": "", "fields": [ { "type": "name", "name": "owner" }, @@ -40,13 +40,13 @@ { "type": "name?", "name": "ram_payer" } ] },{ - "name": "enable_args", + "name": "enable", "base": "", "fields": [ { "type": "symbol_code", "name": "token_code" } ] },{ - "name": "delegate_args", + "name": "delegatevote", "base": "", "fields": [ { "type": "name", "name": "grantor_name" }, @@ -54,7 +54,23 @@ { "type": "asset", "name": "quantity" } ] },{ - "name": "recallvote_args", + "name": "delegateuse", + "base": "", + "fields": [ + { "type": "name", "name": "grantor_name" }, + { "type": "name", "name": "recipient_name" }, + { "type": "asset", "name": "quantity" } + ] + },{ + "name": "recalluse", + "base": "", + "fields": [ + { "type": "name", "name": "grantor_name" }, + { "type": "name", "name": "recipient_name" }, + { "type": "asset", "name": "quantity" } + ] + },{ + "name": "recallvote", "base": "", "fields": [ { "type": "name", "name": "grantor_name" }, @@ -63,53 +79,56 @@ { "type": "int16", "name": "pct" } ] },{ - "name": "setterms_args", - "base": "recallvote_args", + "name": "setgrntterms", + "base": "", "fields": [ + { "type": "name", "name": "grantor_name" }, + { "type": "name", "name": "recipient_name" }, + { "type": "symbol_code", "name": "token_code" }, + { "type": "int16", "name": "pct" }, { "type": "int16", "name": "break_fee" }, { "type": "int64", "name": "break_min_own_staked" } ] },{ - "name": "withdraw_args", + "name": "withdraw", "base": "", "fields": [ { "type": "name", "name": "account" }, { "type": "asset", "name": "quantity" } ] },{ - "name": "acc_code_args", + "name": "setproxylvl", "base": "", "fields": [ { "type": "name", "name": "account" }, - { "type": "symbol_code", "name": "token_code" } - ] - },{ - "name": "setproxylvl_args", - "base": "acc_code_args", - "fields": [ + { "type": "symbol_code", "name": "token_code" }, { "type": "uint8", "name": "level" } ] },{ - "name": "setproxyfee_args", - "base": "acc_code_args", + "name": "setproxyfee", + "base": "", "fields": [ + { "type": "name", "name": "account" }, + { "type": "symbol_code", "name": "token_code" }, { "type": "int16", "name": "fee" } ] },{ - "name": "setminstaked_args", - "base": "acc_code_args", + "name": "setminstaked", + "base": "", "fields": [ + { "type": "name", "name": "account" }, + { "type": "symbol_code", "name": "token_code" }, { "type": "int64", "name": "min_own_staked" } ] },{ - "name": "updatefunds_args", + "name": "updatefunds", "base": "", "fields": [ { "type": "name", "name": "account" }, { "type": "symbol_code", "name": "token_code" } ] },{ - "name": "setkey_args", + "name": "setkey", "base": "", "fields": [ { "type": "name", "name": "account" }, @@ -124,21 +143,21 @@ { "type": "int64", "name": "second" } ] },{ - "name": "reward_args", + "name": "reward", "base": "", "fields": [ { "type": "name_int_pair[]","name": "rewards" }, { "type": "symbol", "name": "sym" } ] },{ - "name": "pick_args", + "name": "pick", "base": "", "fields": [ { "type": "symbol_code", "name": "token_code" }, { "type": "name[]", "name": "accounts" } ] },{ - "name": "claim_args", + "name": "claim", "base": "", "fields": [ { "type": "name", "name": "grantor_name" }, @@ -151,72 +170,55 @@ "actions": [ { "name": "create", - "type": "create_args", - "ricardian_contract": "" + "type": "create" },{ "name": "open", - "type": "open_args", - "ricardian_contract": "" + "type": "open" },{ "name": "enable", - "type": "enable_args", - "ricardian_contract": "" + "type": "enable" },{ "name": "delegatevote", - "type": "delegate_args", - "ricardian_contract": "" + "type": "delegatevote" },{ "name": "setgrntterms", - "type": "setterms_args", - "ricardian_contract": "" + "type": "setgrntterms" },{ "name": "recallvote", - "type": "recallvote_args", - "ricardian_contract": "" + "type": "recallvote" },{ "name": "withdraw", - "type": "withdraw_args", - "ricardian_contract": "" + "type": "withdraw" },{ "name": "setproxylvl", - "type": "setproxylvl_args", - "ricardian_contract": "" + "type": "setproxylvl" },{ "name": "setproxyfee", - "type": "setproxyfee_args", - "ricardian_contract": "" + "type": "setproxyfee" },{ "name": "setminstaked", - "type": "setminstaked_args", - "ricardian_contract": "" + "type": "setminstaked" },{ "name": "setkey", - "type": "setkey_args", - "ricardian_contract": "" + "type": "setkey" },{ "name": "updatefunds", - "type": "updatefunds_args", - "ricardian_contract": "" + "type": "updatefunds" },{ "name": "reward", - "type": "reward_args", - "ricardian_contract": "" + "type": "reward" },{ "name": "pick", - "type": "pick_args", - "ricardian_contract": "" + "type": "pick" },{ "name": "delegateuse", - "type": "delegate_args", - "ricardian_contract": "" + "type": "delegateuse" },{ "name": "recalluse", - "type": "delegate_args", - "ricardian_contract": "" + "type": "recalluse" },{ "name": "claim", - "type": "claim_args", - "ricardian_contract": "" + "type": "claim" } ], "tables": [ @@ -238,6 +240,7 @@ ] } ], + "events": [], "ricardian_clauses": [], "variants": [], "abi_extensions": [] diff --git a/cyber.token/abi/cyber.token.abi b/cyber.token/abi/cyber.token.abi index 6ba9147a5..314936d2b 100644 --- a/cyber.token/abi/cyber.token.abi +++ b/cyber.token/abi/cyber.token.abi @@ -161,6 +161,20 @@ } ] }, + { + "name": "bulkpayment", + "base": "", + "fields": [ + { + "name": "from", + "type": "name" + }, + { + "name": "recipients", + "type": "recipient[]" + } + ] + }, { "name": "transfer", "base": "", @@ -183,6 +197,28 @@ } ] }, + { + "name": "payment", + "base": "", + "fields": [ + { + "name": "from", + "type": "name" + }, + { + "name": "to", + "type": "name" + }, + { + "name": "quantity", + "type": "asset" + }, + { + "name": "memo", + "type": "string" + } + ] + }, { "name": "claim", "base": "", @@ -226,7 +262,7 @@ }, { "name": "bulkpayment", - "type": "bulktransfer" + "type": "bulkpayment" }, { "name": "transfer", @@ -234,7 +270,7 @@ }, { "name": "payment", - "type": "transfer" + "type": "payment" }, { "name": "claim",