diff --git a/.gitignore b/.gitignore index c520b309..003d28ea 100644 --- a/.gitignore +++ b/.gitignore @@ -11,4 +11,5 @@ testsetup/ *.iws # nix -env \ No newline at end of file +env +/dshackle-cli/node_modules/ diff --git a/.gitmodules b/.gitmodules index cbd279b8..6f37b1a9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "emerald-java-client"] path = emerald-java-client url = git@github.com:p2p-org/emerald-java-client.git +[submodule "dshackle-cli/grpc"] + path = dshackle-cli/grpc + url = https://github.com/emeraldpay/emerald-grpc.git diff --git a/dshackle-cli/grpc b/dshackle-cli/grpc new file mode 160000 index 00000000..0d32b45d --- /dev/null +++ b/dshackle-cli/grpc @@ -0,0 +1 @@ +Subproject commit 0d32b45d007417c901ca704c9324b5e6c7167f4f diff --git a/dshackle-cli/package-lock.json b/dshackle-cli/package-lock.json index c79eabab..edee9a4a 100644 --- a/dshackle-cli/package-lock.json +++ b/dshackle-cli/package-lock.json @@ -17,7 +17,7 @@ "inquirer": "^9.1.1" }, "bin": { - "dshackle-cli": "bin/dshackle-cli" + "dshackle-cli-tool": "bin/dshackle-cli-tool" } }, "node_modules/@grpc/grpc-js": { diff --git a/dshackle-cli/package.json b/dshackle-cli/package.json index fb7f5613..29bcd25e 100644 --- a/dshackle-cli/package.json +++ b/dshackle-cli/package.json @@ -1,6 +1,6 @@ { "name": "dshackle-cli-tool", - "version": "1.0.3", + "version": "1.0.4", "description": "", "main": "src/index.js", "scripts": { @@ -24,6 +24,6 @@ "files": [ "bin/", "src/", - "proto/" + "grpc/" ] } diff --git a/dshackle-cli/proto/blockchain.proto b/dshackle-cli/proto/blockchain.proto deleted file mode 100644 index 05d92c3c..00000000 --- a/dshackle-cli/proto/blockchain.proto +++ /dev/null @@ -1,284 +0,0 @@ -syntax = "proto3"; -package emerald; -option java_package = "io.emeraldpay.api.proto"; -import "common.proto"; - -service Blockchain { - rpc SubscribeHead (Chain) returns (stream ChainHead) {} - rpc SubscribeBalance (BalanceRequest) returns (stream AddressBalance) {} - rpc SubscribeTxStatus (TxStatusRequest) returns (stream TxStatus) {} - - rpc GetBalance (BalanceRequest) returns (stream AddressBalance) {} - - /** - * Fee Estimation service. The server tries to estimate a fair fee based on the last N blocks. - */ - rpc EstimateFee (EstimateFeeRequest) returns (EstimateFeeResponse) {} - - rpc NativeCall (NativeCallRequest) returns (stream NativeCallReplyItem) {} - rpc NativeSubscribe (NativeSubscribeRequest) returns (stream NativeSubscribeReplyItem) {} - - rpc Describe (DescribeRequest) returns (DescribeResponse) {} - rpc SubscribeStatus (StatusRequest) returns (stream ChainStatus) {} -} - -message NativeCallRequest { - ChainRef chain = 1; - repeated NativeCallItem items = 2; - Selector selector = 3; - int32 quorum = 4; - AvailabilityEnum min_availability = 5; -} - -message NativeCallItem { - uint32 id = 1; - string method = 3; - bytes payload = 4; - uint64 nonce = 5; -} - -/** - * Signature for a response - */ -message NativeCallReplySignature { - /** - * Original nonce value used for the call - */ - uint64 nonce = 1; - /** - * Signature value - */ - bytes signature = 2; - /** - * Key Id used for the signing - */ - uint64 key_id = 3; - /** - * Id of the upstream produced the response - */ - string upstream_id = 4; -} - -message NativeCallReplyItem { - uint32 id = 1; - bool succeed = 2; - bytes payload = 3; - string errorMessage = 4; - /** - * Optional signature for the response. - * Available only when it's configured at the edge dshackle and nonce is provided wit the request. - */ - NativeCallReplySignature signature = 5; -} - -message NativeSubscribeRequest { - ChainRef chain = 1; - string method = 2; - bytes payload = 3; -} - -message NativeSubscribeReplyItem { - bytes payload = 1; -} - -message ChainHead { - ChainRef chain = 1; - uint64 height = 2; - string block_id = 3; - uint64 timestamp = 4; - bytes weight = 5; - uint64 reorg = 6; -} - -message TxStatusRequest { - ChainRef chain = 1; - string tx_id = 2; - uint32 confirmation_limit = 3; -} - -message TxStatus { - string tx_id = 1; - bool broadcasted = 2; - bool mined = 3; - BlockInfo block = 4; - uint32 confirmations = 5; -} - -message BalanceRequest { - Asset asset = 1; - AnyAddress address = 2; - bool include_utxo = 3; -} - -message AddressBalance { - Asset asset = 1; - SingleAddress address = 2; - string balance = 3; - bool confirmed = 4; - repeated Utxo utxo = 5; -} - -message Utxo { - string tx_id = 1; - uint64 index = 2; - string balance = 3; - bool spent = 4; -} - -message DescribeRequest { -} - -message DescribeResponse { - repeated DescribeChain chains = 1; -} - -message DescribeChain { - ChainRef chain = 1; - ChainStatus status = 2; - repeated NodeDetails nodes = 3; - repeated string supportedMethods = 4; - repeated string excludedMethods = 5; - repeated Capabilities capabilities = 6; -} - -message StatusRequest { - repeated ChainRef chains = 1; -} - -message ChainStatus { - ChainRef chain = 1; - AvailabilityEnum availability = 2; - uint32 quorum = 3; -} - -enum AvailabilityEnum { - AVAIL_UNKNOWN = 0; - AVAIL_OK = 1; - AVAIL_LAGGING = 2; - AVAIL_IMMATURE = 3; - AVAIL_SYNCING = 4; - AVAIL_UNAVAILABLE = 5; -} - -message NodeDetails { - uint32 quorum = 1; - repeated Label labels = 2; -} - -enum Capabilities { - CAP_NONE = 0; - CAP_CALLS = 1; - CAP_BALANCE = 2; -} - -message Label { - string name = 1; - string value = 2; -} - -message Selector { - oneof selector_type { - LabelSelector labelSelector = 1; - OrSelector orSelector = 2; - AndSelector andSelector = 3; - NotSelector notSelector = 4; - ExistsSelector existsSelector = 5; - } -} - -message LabelSelector { - string name = 1; - repeated string value = 2; -} - -message OrSelector { - repeated Selector selectors = 1; -} - -message AndSelector { - repeated Selector selectors = 1; -} - -message NotSelector { - Selector selector = 1; -} - -message ExistsSelector { - string name = 1; -} - -/** - * Request for Fee Estimation Service - */ -message EstimateFeeRequest { - // Target chain - ChainRef chain = 1; - // The way how the fee should be estimated - FeeEstimationMode mode = 2; - // How many blocks the server is supposed to use to estimate current fee. Note that the server may use value, depending on configuration - uint32 blocks = 3; -} - -/** - * Responset for Fee Estimation Service - */ -message EstimateFeeResponse { - // May return different struct, depending on the blockchain - oneof fee_type { - // Standard Ethereum Fee, supported by majority of forks and by Ethereum Mainnet before EIP-1559 - EthereumStdFees ethereumStd = 1; - // Ethereum Fee for EIP-1559 compatible forks - EthereumExtFees ethereumExtended = 2; - // Standard Bitcoin Fee - BitcoinStdFees bitcoinStd = 3; - } -} - -/** - * The mode of how the fee must be estimated - */ -enum FeeEstimationMode { - INVALID = 0; - // Average over last transaction in each block - AVG_LAST = 1; - // Average over transaction 5th from the end in each block - AVG_T5 = 2; - // Average over transaction 20th from the end in each block - AVG_T20 = 3; - // Average over transaction 50th from the end in each block - AVG_T50 = 4; - // Minimal fee that would be accepted by every last block - MIN_ALWAYS = 5; - // Average over transaction in the middle of each block - AVG_MIDDLE = 6; - // Average over transaction in head of each block. Note that for Bitcoin it doesn't count COINBASE tx as top tx. - AVG_TOP = 7; -} - -/** - * Standard Ethereum Fee, supported by majority of forks and by Ethereum Mainnet before EIP-1559 - */ -message EthereumStdFees { - // Big Number encoded as string. Fee value in Wei - string fee = 1; -} - -/** - * Ethereum Fee for EIP-1559 compatible forks - */ -message EthereumExtFees { - // Big Number encoded as string. Estimated fee that expected to be actually paid. I.e. it's the Base Fee + Priority Fee - string expect = 1; - // Big Number encoded as string. Priority Fee in Wei - string priority = 2; - // Big Number encoded as string. Max Fee value in Wei. Note that it only indicates the current preference, and the actual Max may be significantly lower, depending on the usage scenario. - string max = 3; -} - -/** - * Standard Bitcoin Fee - */ -message BitcoinStdFees { - // Fee in Satoshi per Kilobyte. Note that the actual fee calculation MUST divide it by 1024 at the last step to get a fair fee. - uint64 satPerKb = 1; -} diff --git a/dshackle-cli/proto/common.proto b/dshackle-cli/proto/common.proto deleted file mode 100644 index 5d299d7e..00000000 --- a/dshackle-cli/proto/common.proto +++ /dev/null @@ -1,74 +0,0 @@ -syntax = "proto3"; -package emerald; -option java_package = "io.emeraldpay.api.proto"; - -message Chain { - ChainRef type = 1; -} - -enum ChainRef { - CHAIN_UNSPECIFIED = 0; - - CHAIN_BITCOIN = 1; - // CHAIN_GRIN = 2; - - CHAIN_ETHEREUM = 100; - CHAIN_ETHEREUM_CLASSIC = 101; - CHAIN_FANTOM = 102; // Fantom, https://fantom.foundation/ - - // Sidechains and state channels start with 1_000 - // CHAIN_LIGHTNING = 1001; - CHAIN_MATIC = 1002; // Matic PoS Ethereum sidechain based on Polygon - CHAIN_RSK = 1003; // RSK sidechain, https://www.rsk.co/ - - // Testnets start with 10_000 - CHAIN_MORDEN = 10001; - CHAIN_KOVAN = 10002; - CHAIN_TESTNET_BITCOIN = 10003; - // CHAIN_FLOONET = 10004; - CHAIN_GOERLI = 10005; - CHAIN_ROPSTEN = 10006; - CHAIN_RINKEBY = 10007; - - // Non-standard starts from 20_000 -} - -message SingleAddress { - string address = 1; -} - -message XpubAddress { - bytes xpub = 1; - string path = 2; - uint64 start = 3; - uint64 limit = 4; -} - -message MultiAddress { - repeated SingleAddress addresses = 1; -} - -message ReferenceAddress { - uint64 refid = 1; -} - -message AnyAddress { - oneof addr_type { - SingleAddress address_single = 1; - MultiAddress address_multi = 2; - XpubAddress address_xpub = 3; - ReferenceAddress address_ref = 4; - } -} - -message Asset { - ChainRef chain = 1; - string code = 2; -} - -message BlockInfo { - uint64 height = 1; - string block_id = 2; - uint64 timestamp = 3; - bytes weight = 4; -} \ No newline at end of file diff --git a/dshackle-cli/src/grpc-clent.js b/dshackle-cli/src/grpc-clent.js index dca4be90..f4a32c64 100644 --- a/dshackle-cli/src/grpc-clent.js +++ b/dshackle-cli/src/grpc-clent.js @@ -2,7 +2,7 @@ const grpc = require("@grpc/grpc-js"); const path = require('path') const protoLoader = require("@grpc/proto-loader"); -const PROTO_PATH = path.join(__dirname, "../proto/blockchain.proto"); +const PROTO_PATH = path.join(__dirname, "../grpc/proto/blockchain.proto"); const options = { keepCase: true,