From ef8b224fb9b11a7e870feec84bcb366109fdea3c Mon Sep 17 00:00:00 2001 From: Alex White Date: Tue, 4 Feb 2020 12:38:22 +0000 Subject: [PATCH 1/9] Update latest delta hash response to use delta index instead of plain cid --- src/IPPN.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/IPPN.proto b/src/IPPN.proto index 3f9f451..c73a636 100644 --- a/src/IPPN.proto +++ b/src/IPPN.proto @@ -39,7 +39,7 @@ message PingResponse { } message LatestDeltaHashRequest { } message LatestDeltaHashResponse { - bytes delta_hash = 1; // Rhe cid of a nodes last delta. + Deltas.DeltaIndex result = 1; // K given del } message DeltaHistoryRequest { From cd5c099b42614c222cfb52bee96595a75fcf4b78 Mon Sep 17 00:00:00 2001 From: Tomasz Kajetan Stanczak Date: Mon, 10 Feb 2020 22:50:55 +0100 Subject: [PATCH 2/9] changes required for Web3 integration --- src/Deltas.proto | 1 + src/Transaction.proto | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Deltas.proto b/src/Deltas.proto index ca38381..96211b5 100644 --- a/src/Deltas.proto +++ b/src/Deltas.proto @@ -40,4 +40,5 @@ message Delta { repeated Transaction.ConfidentialEntry confidential_entries = 6; repeated Transaction.CoinbaseEntry coinbase_entries = 7; // one per active worker bytes state_root = 8; // the hash of the state root + int64 delta_number = 9; // the consecutive delta number } diff --git a/src/Transaction.proto b/src/Transaction.proto index fda46bf..3b44885 100644 --- a/src/Transaction.proto +++ b/src/Transaction.proto @@ -40,7 +40,6 @@ message PublicEntry { google.protobuf.Timestamp timestamp = 5; bytes gas_price = 6; uint64 gas_limit = 7; - bytes transaction_fees = 8; // 8 bytes, clear text, fees * 10^12 uint64 nonce = 9; // A nonce, similar to Ethereum, incremented on each transaction on the account issuing the transaction Cryptography.Signature signature = 10; // is the ed25519ph context signature } From 53d5b324bf95934a6198e378cded6f888df79a86 Mon Sep 17 00:00:00 2001 From: Alex White Date: Fri, 14 Feb 2020 11:07:41 +0000 Subject: [PATCH 3/9] Update to IPPN --- src/IPPN.proto | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/IPPN.proto b/src/IPPN.proto index c73a636..e495f39 100644 --- a/src/IPPN.proto +++ b/src/IPPN.proto @@ -39,7 +39,8 @@ message PingResponse { } message LatestDeltaHashRequest { } message LatestDeltaHashResponse { - Deltas.DeltaIndex result = 1; // K given del + bool isSync = 1; + Deltas.DeltaIndex deltaIndex = 2; // K given del } message DeltaHistoryRequest { @@ -48,5 +49,5 @@ message DeltaHistoryRequest { } message DeltaHistoryResponse { - repeated Deltas.DeltaIndex result = 1; // K given del + repeated Deltas.DeltaIndex deltaIndex = 1; // K given del } \ No newline at end of file From ef97faa09770aeb459c6571fff0dabf46e549072 Mon Sep 17 00:00:00 2001 From: nshCore Date: Wed, 19 Feb 2020 14:44:24 +0000 Subject: [PATCH 4/9] Develop (#120) * fix dep location (#119) * Bump version of sdk-js npm package --- packages/sdk-js/package.json | 6 +++--- packages/sdk-js/publish.sh | 14 -------------- 2 files changed, 3 insertions(+), 17 deletions(-) delete mode 100755 packages/sdk-js/publish.sh diff --git a/packages/sdk-js/package.json b/packages/sdk-js/package.json index 9ecfb41..8fae4c0 100644 --- a/packages/sdk-js/package.json +++ b/packages/sdk-js/package.json @@ -4,7 +4,7 @@ "type": "git", "url": "git+https://github.com/catalyst-network/protocol.git" }, - "version": "0.0.3", + "version": "0.0.4", "description": "Catalyst Protocol SDK-JS", "main": "src/index.js", "scripts": { @@ -23,11 +23,11 @@ }, "homepage": "https://github.com/catalyst-network/protocol#readme", "devDependencies": { - "google-protobuf": "^3.11.2", - "protobufjs": "^6.8.8", "ts-protoc-gen": "^0.12.0" }, "dependencies": { + "google-protobuf": "^3.11.2", + "protobufjs": "^6.8.8", "@types/google-protobuf": "^3.7.2" } } diff --git a/packages/sdk-js/publish.sh b/packages/sdk-js/publish.sh deleted file mode 100755 index 930087b..0000000 --- a/packages/sdk-js/publish.sh +++ /dev/null @@ -1,14 +0,0 @@ -#! /bin/sh - -# setup for npm credentials -echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" > ~/.npmrc - -if [ "$TAG_NEXT" == "true" ]; then - # if we want to publish a testing version - npm install --unsafe-perm --no-optional \ - && npm publish --access public --tag next -else - # production publish, uses version in package.json - npm install --unsafe-perm --no-optional \ - && npm publish --access public -fi From 80e7444fe181026134b5305a9d0f5def563f256a Mon Sep 17 00:00:00 2001 From: Alex White Date: Wed, 4 Mar 2020 17:11:33 +0000 Subject: [PATCH 5/9] Update ping response --- src/IPPN.proto | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/IPPN.proto b/src/IPPN.proto index e495f39..72d9f18 100644 --- a/src/IPPN.proto +++ b/src/IPPN.proto @@ -34,7 +34,10 @@ message PeerNeighborsResponse { message PingRequest { } -message PingResponse { } +message PingResponse { + bool isSync = 1; + uint64 Height = 2; +} message LatestDeltaHashRequest { } From 422524c88b8733d80df8e87a5703d42af7e06457 Mon Sep 17 00:00:00 2001 From: Alex White Date: Thu, 5 Mar 2020 11:33:52 +0000 Subject: [PATCH 6/9] Update IPPN --- src/IPPN.proto | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/IPPN.proto b/src/IPPN.proto index 72d9f18..93915ab 100644 --- a/src/IPPN.proto +++ b/src/IPPN.proto @@ -32,13 +32,14 @@ message PeerNeighborsResponse { repeated Peer.PeerId peers = 1; // Random subset of a nodes peer db. } -message PingRequest { } - -message PingResponse { +message PingRequest { bool isSync = 1; uint64 Height = 2; } +message PingResponse { +} + message LatestDeltaHashRequest { } message LatestDeltaHashResponse { From 7b2c545ae2a7e3dd61a741d5eaf255a79adeea49 Mon Sep 17 00:00:00 2001 From: Alex White Date: Fri, 6 Mar 2020 10:28:47 +0000 Subject: [PATCH 7/9] Revert ping --- src/IPPN.proto | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/IPPN.proto b/src/IPPN.proto index 93915ab..d3e0a2d 100644 --- a/src/IPPN.proto +++ b/src/IPPN.proto @@ -33,8 +33,6 @@ message PeerNeighborsResponse { } message PingRequest { - bool isSync = 1; - uint64 Height = 2; } message PingResponse { From dcead6396aebb02b1b7fb00742fc56776f40e4a9 Mon Sep 17 00:00:00 2001 From: Xela Date: Tue, 24 Mar 2020 22:13:06 +0000 Subject: [PATCH 8/9] Add GasUsed to delta --- src/Deltas.proto | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Deltas.proto b/src/Deltas.proto index 96211b5..9387ba1 100644 --- a/src/Deltas.proto +++ b/src/Deltas.proto @@ -41,4 +41,5 @@ message Delta { repeated Transaction.CoinbaseEntry coinbase_entries = 7; // one per active worker bytes state_root = 8; // the hash of the state root int64 delta_number = 9; // the consecutive delta number + int64 gas_used = 10; // the gas used in the delta } From 32d943ef8f7a9f148dd6270ad4b777a662177d59 Mon Sep 17 00:00:00 2001 From: stxphxn Date: Wed, 25 Mar 2020 11:51:23 +0000 Subject: [PATCH 9/9] update js package version --- packages/sdk-js/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/sdk-js/package.json b/packages/sdk-js/package.json index 8fae4c0..c6d6396 100644 --- a/packages/sdk-js/package.json +++ b/packages/sdk-js/package.json @@ -4,7 +4,7 @@ "type": "git", "url": "git+https://github.com/catalyst-network/protocol.git" }, - "version": "0.0.4", + "version": "0.0.5", "description": "Catalyst Protocol SDK-JS", "main": "src/index.js", "scripts": {