update to version 1.0.0 (#18)

* version 1.0.0

* bump version

Author: PaperHS

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 1.0.0 (November 12, 2019)
+  - version 1.0.0
+
 ## 0.39.3 (November 08, 2019)
 
 

Makefile

@@ -61,12 +61,12 @@ precommit: dep build test
 
 travis:
 	@echo "Travis ..."
-	@echo $(AWS_S3_ACCESSKEY)
 
 travis-deploy: 
 	@echo "Deploy the software by travis"
 	@make release
 	@./gradlew build
+	@./gradlew shadowJar
 	@./gradlew publish
 
 clean:

core/build.gradle

@@ -75,6 +75,7 @@ protobuf {
       }
     }
   }
+
 }
 
 dokka {
@@ -83,27 +84,14 @@ dokka {
   outputDirectory = "./docs/"
   jdkVersion = 8
   includes = ['overview.md']
-
-//  linkMapping {
-//    dir = "src/main/java"
-//    url = "https://github.com/JetBrains/kotlin-examples/tree/master/gradle/dokka-gradle-example/src/main/kotlin"
-//    suffix = "#L"
-//  }
-//  packageOptions {
-//    prefix = "kotlin.internal" // will match kotlin.internal and all sub-packages of it
-//    suppress = true
-//  }
-
   packageOptions {
     prefix = "io.arcblock.forge.utils"
     suppress = true
   }
-
   packageOptions {
     prefix = "io.arcblock.forge.hash.sha"
     suppress = true
   }
-
   packageOptions {
     prefix = "abci_vendor"
     suppress = true
@@ -155,13 +143,6 @@ jar {
   manifest {
     attributes "Main-Class": "io.arcblock.forge.ForgeSDK"
   }
-  // This line of code recursively collects and copies all of a project's files
-  // and adds them to the JAR itself. One can extend this task, to skip certain
-  // files or particular types at will
-//  from(sourceSets {
-//    mainClasses
-//  })
-//  configurations.compileClasspath.forEach{ it.isDirectory() ? from(it) : from(zipTree(it)) }
 
 }
 shadowJar{

core/src/main/java/io/arcblock/forge/did/WalletInfo.kt

@@ -2,16 +2,18 @@ package io.arcblock.forge.did
 
 import forge_abi.Rpc
 import forge_abi.Type
+import io.arcblock.forge.WalletUtils
+import io.arcblock.forge.extension.address
 import io.arcblock.forge.extension.toByteString
 import io.arcblock.forge.utils.Base58Btc
 
-data class WalletInfo(val address: String, val pk: ByteArray,val sk: ByteArray) {
+data class WalletInfo(val address: String, val pk: ByteArray, val sk: ByteArray) {
 
-  constructor(response: Rpc.ResponseCreateWallet):this(response.wallet.address,response.wallet.pk.toByteArray()
-    ,response.wallet.sk.toByteArray())
+  constructor(response: Rpc.ResponseCreateWallet) : this(response.wallet.address, response.wallet.pk.toByteArray()
+    , response.wallet.sk.toByteArray())
 
-  constructor(wallet: Type.WalletInfo):this(wallet.address,wallet.pk.toByteArray()
-    ,wallet.sk.toByteArray())
+  constructor(wallet: Type.WalletInfo) : this(wallet.address, wallet.pk.toByteArray()
+    , wallet.sk.toByteArray())
 
 
   /**
@@ -37,8 +39,28 @@ data class WalletInfo(val address: String, val pk: ByteArray,val sk: ByteArray)
 
   fun pkBase58(): String = Base58Btc.encode(pk)
 
-  fun toTypeWalletInfo(): Type.WalletInfo{
-    return Type.WalletInfo.newBuilder().setSk(sk.toByteString()).setPk(pk.toByteString()).setAddress(address).build()
+  fun toTypeWalletInfo(): Type.WalletInfo {
+    return Type.WalletInfo.newBuilder()
+      .setSk(sk.toByteString())
+      .setPk(pk.toByteString())
+      .setAddress(address)
+      .build()
+  }
+
+  companion object {
+    /**
+     * generate wallet from private key
+     */
+    fun fromSk(sk: ByteArray, hashType: HashType, keyType: KeyType, roleType: RoleType): WalletInfo {
+      val pk = WalletUtils.sk2pk(KeyType.ED25519, sk)
+      val did = DIDGenerator.pk2did(roleType, hashType = hashType, keyType = keyType, pk = pk)
+      return WalletInfo(did.address(), pk, sk)
+    }
+
+    /**
+     * generate wallet from private key
+     */
+    fun fromSk(sk: ByteArray) = fromSk(sk, HashType.SHA3, KeyType.ED25519, RoleType.ACCOUNT)
   }
 
 }

core/src/main/proto/enum.proto

@@ -52,7 +52,7 @@ enum StatusCode {
   invalid_deposit_target = 45;
   invalid_depositor = 46;
   invalid_withdrawer = 47;
-  duplicate_tether = 48;
+  // duplicate_tether = 48;
   invalid_expiry_date = 49;
   invalid_deposit = 50;
   invalid_custodian = 51;
@@ -75,6 +75,7 @@ enum StatusCode {
   invalid_withdraw_tx=66;
   invalid_chain_type=67;
   invalid_time=68;
+  invalid_subscribe=69;
 
   forbidden = 403;
   internal = 500;
@@ -121,7 +122,7 @@ enum RoleType {
   role_validator = 8;
   role_group = 9;
   role_tx = 10;
-  role_tether = 11;
+  // role_tether = 11;
   role_any = 63;
 }
 

core/src/main/proto/rpc.proto

@@ -1,7 +1,6 @@
 syntax = "proto3";
 package forge_abi;
 
-import "google/protobuf/any.proto";
 import "vendor.proto";
 import "enum.proto";
 import "type.proto";
@@ -10,35 +9,6 @@ import "trace_type.proto";
 
 // Request / Response message definition
 
-// create_tx(itx, wallet, token)
-message RequestCreateTx {
-  google.protobuf.Any itx = 1;
-  string from = 2;
-  uint64 nonce = 3;
-  WalletInfo wallet = 4;
-  string token = 5;
-}
-
-message ResponseCreateTx {
-  StatusCode code = 1;
-  Transaction tx = 2;
-}
-
-// multisig(tx, wallet, token)
-message RequestMultisig {
-  Transaction tx = 1;
-  // extra data for multisig
-  google.protobuf.Any data = 2;
-  WalletInfo wallet = 3;
-  string token = 4;
-  string delegatee = 5;
-}
-
-message ResponseMultisig {
-  StatusCode code = 1;
-  Transaction tx = 2;
-}
-
 // send_tx(tx, wallet, token, commit \\ false)
 message RequestSendTx {
   Transaction tx = 1;
@@ -80,60 +50,6 @@ message ResponseGetBlocks {
   repeated BlockInfoSimple blocks = 3;
 }
 
-// create_wallet(moniker, passphrase): create an account locally
-message RequestCreateWallet {
-  string passphrase = 1;
-  WalletType type = 2;
-  string moniker = 3;
-}
-
-message ResponseCreateWallet {
-  StatusCode code = 1;
-  string token = 2;
-  WalletInfo wallet = 3;
-}
-
-// load_wallet(address, passphrase): load account to memory with given
-// passphrase
-message RequestLoadWallet {
-  string address = 1;
-  string passphrase = 2;
-}
-
-message ResponseLoadWallet {
-  StatusCode code = 1;
-  string token = 2;
-  WalletInfo wallet = 3;
-}
-
-// recover_wallet(data, passphrase): recover to a keystore with given
-// passphrase. data could be seed words or bytes of secret key.
-message RequestRecoverWallet {
-  bytes data = 1;
-  WalletType type = 2;
-  string passphrase = 3;
-  string moniker = 4;
-}
-
-message ResponseRecoverWallet {
-  StatusCode code = 1;
-  string token = 2;
-  WalletInfo wallet = 3;
-}
-
-// list_wallet(): list accounts stored in this node
-message RequestListWallet {}
-
-message ResponseListWallet {
-  StatusCode code = 1;
-  string address = 2;
-}
-
-// remove_wallet(hash): remove account by hash for this node
-message RequestRemoveWallet { string address = 1; }
-
-message ResponseRemoveWallet { StatusCode code = 1; }
-
 message RequestDeclareNode { bool validator = 1; }
 
 message ResponseDeclareNode {
@@ -200,17 +116,6 @@ message ResponseGetForgeState {
   ForgeState state = 2;
 }
 
-message RequestGetTetherState {
-  string address = 1;
-  repeated string keys = 2;
-  uint64 height = 3;
-}
-
-message ResponseGetTetherState {
-  StatusCode code = 1;
-  TetherState state = 2;
-}
-
 message RequestGetSwapState {
   string address = 1;
   repeated string keys = 2;
@@ -321,32 +226,42 @@ message ResponseSubscribe {
     Transaction confirm = 5;
     Transaction create_asset = 6;
     Transaction exchange = 7;
-    Transaction revoke = 8;
+    Transaction revoke = 8 [deprecated = true];
 
     abci_vendor.RequestBeginBlock begin_block = 16;
     abci_vendor.RequestEndBlock end_block = 17;
 
     Transaction declare = 19;
     Transaction update_asset = 20;
     Transaction consensus_upgrade = 21;
-    Transaction declare_file = 22;
+    Transaction declare_file = 22 [deprecated = true];
     Transaction sys_upgrade = 23;
     Transaction stake = 24;
     Transaction delegate = 25;
-    Transaction activate_protocol=26;
-    Transaction deactivate_protocol=27;
-    Transaction revoke_delegate=28;
-    Transaction deposit_token=29;
-    Transaction withdraw_token=30;
-    Transaction approve_withdraw=31;
-    Transaction revoke_withdraw=32;
+    Transaction activate_protocol = 26;
+    Transaction deactivate_protocol = 27;
+    Transaction revoke_delegate = 28;
+    Transaction deposit_token = 29;
+    Transaction withdraw_token = 30;
+    Transaction approve_withdraw = 31;
+    Transaction revoke_withdraw = 32;
+    Transaction setup_swap = 33;
+    Transaction revoke_swap = 34;
+    Transaction retrieve_swap = 35;
+    Transaction poke = 36;
+    Transaction deploy_protocol = 37;
+    Transaction consume_asset = 38;
+    Transaction acquire_asset = 39;
+    Transaction upgrade_node = 40;
+
 
     AccountState account_state = 129;
     AssetState asset_state = 130;
     ForgeState forge_state = 131;
     StakeState stake_state = 132;
     ProtocolState protocol_state = 133;
     DelegateState delegate_state = 134;
+    SwapState swap_state = 135;
   }
 }
 
@@ -457,20 +372,6 @@ message ResponseListBlocks {
   repeated IndexedBlock blocks = 3;
 }
 
-message RequestListTethers {
-  PageInput paging = 1;
-  string depositor = 2;
-  string withdrawer = 3;
-  string custodian = 4;
-  bool available = 5;
-}
-
-message ResponseListTethers {
-  StatusCode code = 1;
-  PageInfo page = 2;
-  repeated TetherState tethers = 3;
-}
-
 message RequestListSwap {
   PageInput paging = 1;
   string sender = 2;

core/src/main/proto/service.proto

@@ -12,8 +12,6 @@ import "rpc.proto";
 
 service ChainRpc {
   // tx related
-  rpc create_tx(RequestCreateTx) returns (ResponseCreateTx);
-  rpc multisig(RequestMultisig) returns (ResponseMultisig);
   rpc send_tx(RequestSendTx) returns (ResponseSendTx);
   rpc get_tx(stream RequestGetTx) returns (stream ResponseGetTx);
   rpc get_block(stream RequestGetBlock) returns (stream ResponseGetBlock);
@@ -53,8 +51,6 @@ service StateRpc {
       returns (stream ResponseGetProtocolState);
   rpc get_stake_state(stream RequestGetStakeState)
       returns (stream ResponseGetStakeState);
-  rpc get_tether_state(stream RequestGetTetherState)
-      returns (stream ResponseGetTetherState);
   rpc get_swap_state(stream RequestGetSwapState)
       returns (stream ResponseGetSwapState);
   rpc get_delegate_state(stream RequestGetDelegateState)
@@ -63,11 +59,6 @@ service StateRpc {
 
 service WalletRpc {
   // wallet related
-  rpc create_wallet(RequestCreateWallet) returns (ResponseCreateWallet);
-  rpc load_wallet(RequestLoadWallet) returns (ResponseLoadWallet);
-  rpc recover_wallet(RequestRecoverWallet) returns (ResponseRecoverWallet);
-  rpc list_wallet(RequestListWallet) returns (stream ResponseListWallet);
-  rpc remove_wallet(RequestRemoveWallet) returns (ResponseRemoveWallet);
   rpc declare_node(RequestDeclareNode) returns (ResponseDeclareNode);
 }
 
@@ -85,6 +76,5 @@ service StatsRpc {
   rpc list_blocks(RequestListBlocks) returns (ResponseListBlocks);
   rpc get_health_status(RequestGetHealthStatus)
       returns (ResponseGetHealthStatus);
-  rpc list_tethers(RequestListTethers) returns (ResponseListTethers);
   rpc list_swap(RequestListSwap) returns (ResponseListSwap);
 }