minter 0.2.0 → 1.0.1

data/lib/minter/transactions/declare_candidacy_tx.rb

@@ -2,8 +2,6 @@
 
 module Minter
   class DeclareCandidacyTx < Transaction
-    SIGN_METHOD = :SignDeclareCandidacyTransaction
-
     attr_accessor :address, :pubkey, :commission, :coin, :stake, :nonce, :chain_id, :gas_coin, :gas_price
 
     def initialize(address:, pubkey:, commission:, coin:, stake:, nonce:, chain_id:, gas_coin:, gas_price:) # rubocop:disable Metrics/ParameterLists

data/lib/minter/transactions/delegate_tx.rb

@@ -2,7 +2,6 @@
 
 module Minter
   class DelegateTx < Transaction
-    SIGN_METHOD = :SignDelegateTransaction
     attr_accessor :pubkey, :coin, :value, :nonce, :chain_id, :gas_coin, :gas_price
 
     def initialize(pubkey:, coin:, value:, nonce:, chain_id:, gas_coin:, gas_price:) # rubocop:disable Metrics/ParameterLists

data/lib/minter/transactions/edit_candidate_tx.rb

@@ -2,13 +2,13 @@
 
 module Minter
   class EditCandidateTx < Transaction
-    SIGN_METHOD = :SignEditCandidateTransaction
-    attr_accessor :pubkey, :reward_address, :owner_address, :nonce, :chain_id, :gas_coin, :gas_price
+    attr_accessor :pubkey, :reward_address, :owner_address, :control_address, :nonce, :chain_id, :gas_coin, :gas_price
 
-    def initialize(pubkey:, reward_address:, owner_address:, nonce:, chain_id:, gas_coin:, gas_price:) # rubocop:disable Metrics/ParameterLists
+    def initialize(pubkey:, reward_address:, owner_address:, control_address:, nonce:, chain_id:, gas_coin:, gas_price:) # rubocop:disable Metrics/ParameterLists
       @pubkey = pubkey
       @reward_address = reward_address
       @owner_address = owner_address
+      @control_address = control_address
       @nonce = nonce
       @chain_id = chain_id
       @gas_coin = gas_coin
@@ -19,6 +19,7 @@ module Minter
       { PubKey: pubkey,
         RewardAddress: reward_address,
         OwnerAddress: owner_address,
+        ControlAddress: control_address,
         Nonce: nonce,
         ChainId: chain_id,
         GasCoin: gas_coin,

data/lib/minter/transactions/multi_send_tx.rb

@@ -2,7 +2,6 @@
 
 module Minter
   class MultiSendTx < Transaction
-    SIGN_METHOD = :SignMultiSendTransaction
     attr_accessor :items, :coin, :nonce, :chain_id, :gas_coin, :gas_price
 
     def initialize(nonce:, chain_id:, gas_coin:, gas_price:)
@@ -13,8 +12,8 @@ module Minter
       @items = []
     end
 
-    def add_item(symbol:, value:, address_to:)
-      @items << { Symbol: symbol, Value: value, AddressTo: address_to }
+    def add_item(coin_id:, value:, address_to:)
+      @items << { CoinID: coin_id, Value: value, AddressTo: address_to }
     end
 
     def to_params

data/lib/minter/transactions/redeem_check_tx.rb

@@ -2,7 +2,6 @@
 
 module Minter
   class RedeemCheckTx < Transaction
-    SIGN_METHOD = :SignRedeemCheckTransaction
     attr_accessor :check, :proof, :nonce, :chain_id, :gas_coin, :gas_price
 
     def initialize(check:, proof:, nonce:, chain_id:, gas_coin:, gas_price:) # rubocop:disable Metrics/ParameterLists

data/lib/minter/transactions/sell_all_coin_tx.rb

@@ -2,7 +2,6 @@
 
 module Minter
   class SellAllCoinTx < Transaction
-    SIGN_METHOD = :SignSellAllCoinTransaction
     attr_accessor :coin_to_sell, :coin_to_buy, :minimum_value_to_buy, :nonce, :chain_id, :gas_coin, :gas_price
 
     def initialize(coin_to_sell:, coin_to_buy:, minimum_value_to_buy:, nonce:, chain_id:, gas_coin:, gas_price:) # rubocop:disable Metrics/ParameterLists

data/lib/minter/transactions/sell_coin_tx.rb

@@ -2,7 +2,6 @@
 
 module Minter
   class SellCoinTx < Transaction
-    SIGN_METHOD = :SignSellCoinTransaction
     attr_accessor :coin_to_sell, :value_to_sell, :coin_to_buy, :minimum_value_to_buy, :nonce, :chain_id, :gas_coin, :gas_price
 
     def initialize(coin_to_sell:, value_to_sell:, coin_to_buy:, minimum_value_to_buy:, nonce:, chain_id:, gas_coin:, gas_price:) # rubocop:disable Metrics/ParameterLists

data/lib/minter/transactions/send_coin_tx.rb

@@ -2,8 +2,6 @@
 
 module Minter
   class SendCoinTx < Transaction
-    SIGN_METHOD = :SignTransaction
-
     attr_accessor :type, :address_to, :value, :coin, :nonce, :chain_id, :gas_coin, :gas_price
 
     def initialize(address_to:, value:, coin:, nonce:, chain_id:, gas_coin:, gas_price:) # rubocop:disable Metrics/ParameterLists

data/lib/minter/transactions/set_candidate_off_tx.rb

@@ -2,7 +2,6 @@
 
 module Minter
   class SetCandidateOffTx < Transaction
-    SIGN_METHOD = :SignSetCandidateOffTransaction
     attr_accessor :pubkey, :nonce, :chain_id, :gas_coin, :gas_price
 
     def initialize(pubkey:, nonce:, chain_id:, gas_coin:, gas_price:)

data/lib/minter/transactions/set_candidate_on_tx.rb

@@ -2,7 +2,6 @@
 
 module Minter
   class SetCandidateOnTx < Transaction
-    SIGN_METHOD = :SignSetCandidateOnTransaction
     attr_accessor :pubkey, :nonce, :chain_id, :gas_coin, :gas_price
 
     def initialize(pubkey:, nonce:, chain_id:, gas_coin:, gas_price:)

data/lib/minter/transactions/signed_tx.rb

@@ -2,14 +2,14 @@
 
 module Minter
   class SignedTx
-    attr_reader :tx_hash
+    attr_reader :tx_hash, :transaction
 
-    def initialize(tx_hash)
+    def initialize(tx_hash: nil, transaction: nil)
       @tx_hash = tx_hash
+      @transaction = transaction
     end
 
     def send
-      # TODO: maybe create client one time
       Minter::Api::Client.new.send_transaction(transaction: tx_hash)
     end
   end

data/lib/minter/transactions/transaction.rb

@@ -1,17 +1,41 @@
+# frozen_string_literal: true
+
 module Minter
   class TransactionError < StandardError; end
+  class SignError < StandardError; end
 
   class Transaction
     def sign(private_key)
-      params = to_params
-      params[:PrivateKey] = private_key
-
-      result = JSON.parse(Minter::TransactionFfi.send(self.class::SIGN_METHOD, params.to_json))
-      if result["success"]
-        SignedTx.new(result["tx_hash"])
-      else
-        raise TransactionError.new(result["error"])
-      end
+      sign_params = {}
+      sign_params[:PrivateKey] = private_key
+      sign_params[:TxHash] = tx_hash
+
+      result = JSON.parse(Minter::SignFfi.Sign(sign_params.to_json))
+      raise SignError, result["error"] unless result["success"] == "true"
+
+      SignedTx.new(tx_hash: result["tx_hash"], transaction: self)
+    end
+
+    def multisign(multisig_address, *private_keys)
+      multisign_params = {}
+      multisign_params[:PrivateKeys] = private_keys
+      multisign_params[:TxHash] = tx_hash(multisign: true)
+      multisign_params[:MultiSigAddress] = multisig_address
+
+      result = JSON.parse(Minter::SignFfi.MultiSign(multisign_params.to_json))
+      raise SignError, result["error"] unless result["success"] == "true"
+
+      SignedTx.new(tx_hash: result["tx_hash"], transaction: self)
+    end
+
+    def tx_hash(multisign: false)
+      transaction_params = to_params
+      transaction_params[:SignatureType] = multisign ? 2 : 1
+
+      result = JSON.parse(Minter::TxHashFfi.send(self.class.to_s.split("::")[1], transaction_params.to_json))
+      raise TransactionError, result["error"] unless result["success"] == "true"
+
+      result["tx_hash"]
     end
   end
-end
+end

data/lib/minter/transactions/unbond_tx.rb

@@ -2,7 +2,6 @@
 
 module Minter
   class UnbondTx < Transaction
-    SIGN_METHOD = :SignUnbondTransaction
     attr_accessor :pubkey, :coin, :value, :nonce, :chain_id, :gas_coin, :gas_price
 
     def initialize(pubkey:, coin:, value:, nonce:, chain_id:, gas_coin:, gas_price:) # rubocop:disable Metrics/ParameterLists

data/lib/minter/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Minter
-  VERSION = "0.2.0"
+  VERSION = "1.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minter
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Alexander Nikolaev
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-19 00:00:00.000000000 Z
+date: 2020-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv
@@ -131,7 +131,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.9'
 description: This is a Ruby SDK based on Golang SDK for working with Minter blockchain
-email: 
+email:
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -141,9 +141,32 @@ files:
 - README.md
 - bin/console
 - bin/setup
-- lib/ffi/transaction/compile.rb
-- lib/ffi/transaction/transaction_ffi.rb
+- lib/ffi/sign/compile.rb
+- lib/ffi/sign/go.mod
+- lib/ffi/sign/go.sum
+- lib/ffi/sign/sign-darwin-10.6-amd64.dylib
+- lib/ffi/sign/sign-darwin-10.6-amd64.h
+- lib/ffi/sign/sign-linux-amd64.h
+- lib/ffi/sign/sign-linux-amd64.so
+- lib/ffi/sign/sign.go
+- lib/ffi/sign/sign_ffi.rb
+- lib/ffi/tx_hash/compile.rb
+- lib/ffi/tx_hash/go.mod
+- lib/ffi/tx_hash/go.sum
+- lib/ffi/tx_hash/tx-hash-darwin-10.6-amd64.dylib
+- lib/ffi/tx_hash/tx-hash-darwin-10.6-amd64.h
+- lib/ffi/tx_hash/tx-hash-linux-amd64.h
+- lib/ffi/tx_hash/tx-hash-linux-amd64.so
+- lib/ffi/tx_hash/tx_hash.go
+- lib/ffi/tx_hash/tx_hash_ffi.rb
 - lib/ffi/wallet/compile.rb
+- lib/ffi/wallet/go.mod
+- lib/ffi/wallet/go.sum
+- lib/ffi/wallet/wallet-darwin-10.6-amd64.dylib
+- lib/ffi/wallet/wallet-darwin-10.6-amd64.h
+- lib/ffi/wallet/wallet-linux-amd64.h
+- lib/ffi/wallet/wallet-linux-amd64.so
+- lib/ffi/wallet/wallet.go
 - lib/ffi/wallet/wallet_ffi.rb
 - lib/minter.rb
 - lib/minter/api/client.rb
@@ -167,6 +190,7 @@ files:
 - lib/minter/key.rb
 - lib/minter/transactions/buy_coin_tx.rb
 - lib/minter/transactions/create_coin_tx.rb
+- lib/minter/transactions/create_multisig_address_tx.rb
 - lib/minter/transactions/declare_candidacy_tx.rb
 - lib/minter/transactions/delegate_tx.rb
 - lib/minter/transactions/edit_candidate_tx.rb
@@ -189,7 +213,7 @@ metadata:
   homepage_uri: https://github.com/rubyroid-team/minter
   source_code_uri: https://github.com/rubyroid-team/minter
   changelog_uri: https://github.com/rubyroid-team/minter/blob/master/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -205,7 +229,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.8
-signing_key: 
+signing_key:
 specification_version: 4
 summary: This is a Ruby SDK based on Golang SDK for working with Minter blockchain
 test_files: []

data/lib/ffi/transaction/transaction_ffi.rb

@@ -1,93 +0,0 @@
-# frozen_string_literal: true
-
-require "ffi"
-module Minter
-  module TransactionFfi
-    extend FFI::Library
-    filename = RUBY_PLATFORM.match('darwin') ? "/transaction-darwin-10.6-amd64.dylib" : "/transaction-linux-amd64.so"
-    ffi_lib File.join(File.dirname(__FILE__), filename)
-    attach_function :SignTransaction, [:string], :string
-    attach_function :DecodeTransaction, [:string], :string
-    attach_function :SignCreateCoinTransaction, [:string], :string
-    attach_function :SignSellCoinTransaction, [:string], :string
-    attach_function :SignBuyCoinTransaction, [:string], :string
-    attach_function :SignSellAllCoinTransaction, [:string], :string
-    attach_function :SignDeclareCandidacyTransaction, [:string], :string
-    attach_function :SignDelegateTransaction, [:string], :string
-    attach_function :SignUnbondTransaction, [:string], :string
-    attach_function :SignSetCandidateOffTransaction, [:string], :string
-    attach_function :SignSetCandidateOnTransaction, [:string], :string
-    attach_function :SignRedeemCheckTransaction, [:string], :string
-    attach_function :SignEditCandidateTransaction, [:string], :string
-    attach_function :SignMultiSendTransaction, [:string], :string
-  end
-end
-
-# Examples of USAGE FFI
-# ===SEND MNT===
-# tx_params = {
-#     Nonce: 27,
-#     ChainId: 2,
-#     Type: 1,
-#     AddressTo: "Mx7633980c000139dd3bd24a3f54e06474fa941e16",
-#     Value: 24_000_000_000_000_000_000,
-#     Coin: "MNT",
-#     GasCoin: "MNT",
-#     GasPrice: 10,
-#     PrivateKey: "290cd647206bea71ec06d8dfacce30c872aea3fb1ea333b7f475b70467250ca0"
-# }
-# tx = Minter::TransactionFfi.SignTransaction(tx_params.to_json)
-# Minter::Api::Client.new.send_transaction(transaction: tx)
-
-# ==CREATE COIN==
-# tx_params = {
-#     Name: "DEVTWO",
-#     Symbol: "DEVTWO",
-#     InitialAmount: 1000000000000000000,
-#     MaxSupply: 10000000000000000000,
-#     InitialReserve: 10000,
-#     ReserveRation: 10,
-#
-#     Nonce: 29,
-#     ChainId: 2,
-#     GasCoin: "MNT",
-#     GasPrice: 1,
-#     PrivateKey: "290cd647206bea71ec06d8dfacce30c872aea3fb1ea333b7f475b70467250ca0"
-# }
-#
-# tx = Minter::TransactionFfi.SignCreateCoinTransaction(tx_params.to_json)
-# Minter::Api::Client.new.send_transaction(transaction: tx)
-
-# ===SELL_COIN===
-# tx_params = {
-#     CoinToSell: "DEVDEV",
-#     ValueToSell: 1000,
-#     CoinToBuy: "MNT",
-#     MinimumValueToBuy: 100000000,
-#
-#     Nonce: 31,
-#     ChainId: 2,
-#     GasCoin: "MNT",
-#     GasPrice: 1,
-#     PrivateKey: "290cd647206bea71ec06d8dfacce30c872aea3fb1ea333b7f475b70467250ca0"
-# }
-#
-# tx = Minter::TransactionFfi.SignSellCoinTransaction(tx_params.to_json)
-# Minter::Api::Client.new.send_transaction(transaction: tx)
-
-# ===BUY_COIN===
-# tx_params = {
-#     CoinToBuy: "DEVDEV",
-#     ValueToBuy: 1000,
-#     CoinToSell: "MNT",
-#     MaximumValueToSell: 100000000,
-#
-#     Nonce: 31,
-#     ChainId: 2,
-#     GasCoin: "MNT",
-#     GasPrice: 1,
-#     PrivateKey: "290cd647206bea71ec06d8dfacce30c872aea3fb1ea333b7f475b70467250ca0"
-# }
-#
-# tx = Minter::TransactionFfi.SignBuyCoinTransaction(tx_params.to_json)
-# Minter::Api::Client.new.send_transaction(transaction: tx)