glueby 1.1.0 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: feaf2f20c90016badb4f10ca4028c87567f204cdfcdf2dee7d68a7dddbe1af8a
-  data.tar.gz: a7a68472e21a22901b9a1a1d42b12d77c5e12a86cb6086f1fd7d0dd9dafde7b2
+  metadata.gz: cf5bddcac51622b30df3af390b3755b5f98509cb890a4d7505b60bc08b44f896
+  data.tar.gz: 7e456329486fe6f1bef94899827c59a56ae9f6e327fc6149170cb84adb104965
 SHA512:
-  metadata.gz: 9bc1d2d57bbb1e928b30ffefb0d3ae383c9832d0293b5987b74c3ee8cae17466ada78bc0dc60096ee76212e455e12badaee1be80741ffe4f59c79191d1bed67b
-  data.tar.gz: 89d17b7f01272bd5bfabe47cba0a8b776ad6ff1932de3eecdd61372da2ab89cbe3eb0410661d22aaa1743be0a58b023f97ab64503653e9cac11d56fb71c6b93f
+  metadata.gz: '0849f5053fe790bbdbeb4e81829ced6597af38c9dea55c94ab07c2d1e7ce767f064a607451b575d30f5fd2cad8e2155d9de300dfdca9f72abaf0f62f446831a1'
+  data.tar.gz: e1513b7c30d6a3b1c807b3150d4b22c46615fa41167cc2b0e33a14489599811b71cfef5c875e2fdf98ed4ec6f73c360e41b4250787be66371e74bfc2de843c39

data/.github/workflows/ruby.yml

@@ -9,9 +9,9 @@ name: Ruby
 
 on:
   push:
-    branches: [master]
+    branches: [master, v1.1]
   pull_request:
-    branches: [master]
+    branches: [master, v1.1]
 
 jobs:
   test:

data/lib/glueby/internal/wallet/abstract_wallet_adapter.rb

@@ -135,6 +135,15 @@ module Glueby
           raise NotImplementedError, "You must implement #{self.class}##{__method__}"
         end
 
+        # Returns information for the addresses
+        #
+        # @param [String] address - The p2pkh address to get information about
+        # @return [Array<Hash>] The array of hash instance which has keys wallet_id, label and purpose.
+        #                       Returns blank array if the key correspond with the address is not exist.
+        def get_addresses_info(addresses)
+          raise NotImplementedError, "You must implement #{self.class}##{__method__}"
+        end
+
         # Returns a new public key.
         #
         # This method is expected to returns a new public key. The key would generate internally. This key is provided

data/lib/glueby/internal/wallet/active_record_wallet_adapter.rb

@@ -153,6 +153,36 @@ module Glueby
           keys.map(&:address)
         end
 
+        def get_addresses_info(addresses)
+          unless addresses.is_a?(Array)
+            addresses = [addresses]
+          end
+
+          script_pubkeys = addresses.map do |address|
+            Tapyrus::Script.parse_from_addr(address).to_hex
+          rescue ::ArgumentError => e
+            raise Glueby::ArgumentError, "\"#{address}\" is invalid address. #{e.message}"
+          rescue RuntimeError => e
+            if e.message == 'Invalid version bytes.' || e.message == 'Invalid address.'
+              raise Glueby::ArgumentError, "\"#{address}\" is invalid address. #{e.message}"
+            else
+              raise e
+            end
+          end
+
+          keys = AR::Key.where(script_pubkey: script_pubkeys)
+          keys.map do |key|
+            {
+              address: key.address,
+              public_key: key.public_key,
+              wallet_id: key.wallet.wallet_id,
+              label: key.label,
+              purpose: key.purpose,
+              script_pubkey: key.script_pubkey
+            }
+          end
+        end
+
         def create_pay_to_contract_address(wallet_id, contents)
           pubkey = create_pubkey(wallet_id)
           [pay_to_contract_key(wallet_id, pubkey, contents).to_p2pkh, pubkey.pubkey]
@@ -209,7 +239,11 @@ module Glueby
 
           key = Tapyrus::Key.new(pubkey: payment_base, key_type: Tapyrus::Key::TYPES[:compressed])
           commitment = create_pay_to_contract_commitment(key, contents)
-          Tapyrus::Key.new(priv_key: ((ar_key.private_key.to_i(16) + commitment) % group.order).to_even_length_hex, key_type: Tapyrus::Key::TYPES[:compressed]) # K + commitment
+          p2c_private_key = (ar_key.private_key.to_i(16) + commitment) % group.order # K + commitment
+          Tapyrus::Key.new(
+            priv_key: ECDSA::Format::IntegerOctetString.encode(p2c_private_key, 32).bth,
+            key_type: Tapyrus::Key::TYPES[:compressed]
+          )
         end
       end
     end

data/lib/glueby/internal/wallet.rb

@@ -73,6 +73,10 @@ module Glueby
           @wallet_adapter or
             raise Errors::ShouldInitializeWalletAdapter, 'You should initialize wallet adapter using `Glueby::Internal::Wallet.wallet_adapter = some wallet adapter instance`.'
         end
+
+        def get_addresses_info(addresses)
+          @wallet_adapter.get_addresses_info(addresses)
+        end
       end
 
       attr_reader :id

data/lib/glueby/version.rb

@@ -1,3 +1,3 @@
 module Glueby
-  VERSION = "1.1.0"
+  VERSION = "1.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glueby
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.2
 platform: ruby
 authors:
 - azuchi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-11-09 00:00:00.000000000 Z
+date: 2023-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tapyrus