adjust key endpoints

piotr-iohk · May 13, 2021 · 796ff53 · 796ff53
1 parent a30798e
commit 796ff53
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 16 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'cardano_wallet', '~> 0.3.5'
+gem 'cardano_wallet', '~> 0.3.6'
 # gem 'cardano_wallet', path: "~/wb/cardano_wallet"
 gem 'sys-proctable', '~> 1.2.3'
 gem 'docopt', '~> 0.6.1'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -12,7 +12,7 @@ GEM
       rack-test (>= 0.6.3)
       regexp_parser (~> 1.5)
       xpath (~> 3.2)
-    cardano_wallet (0.3.5)
+    cardano_wallet (0.3.6)
       httparty (~> 0.18.0)
     chartkick (3.4.0)
     codecov (0.2.9)
@@ -81,7 +81,7 @@ PLATFORMS
 DEPENDENCIES
   bip_mnemonic (~> 0.0.4)
   capybara
-  cardano_wallet (~> 0.3.5)
+  cardano_wallet (~> 0.3.6)
   chartkick (~> 3.4.0)
   codecov (~> 0.2.8)
   docopt (~> 0.6.1)

diff --git a/app.rb b/app.rb
@@ -62,20 +62,19 @@
   erb :form_get_acc_public_key, { :locals => { :wallets => wallets,
                                           :wid => wid,
                                           :index => params[:index],
-                                          :extended => params[:extended],
+                                          :format => params[:format],
                                           :acc_pub_key => nil
                                         } }
 end
 
 post "/get-acc-pub-key" do
   wallets = @cw.shelley.wallets.list
   handle_api_err wallets, session
-  extended = (params[:extended] == "true") ? true : false
   begin
     acc_pub_key = @cw.shelley.keys.create_acc_public_key(params[:wid],
                                             params[:index],
                                             params[:pass],
-                                            extended)
+                                            params[:format])
   rescue
     session[:error] = "Make sure parameters are valid. "
     redirect "/get-pub-key"
@@ -84,7 +83,7 @@
   erb :form_get_acc_public_key, { :locals => { :wallets => wallets,
                                           :wid => params[:wid],
                                           :index => params[:index],
-                                          :extended => params[:extended],
+                                          :format => params[:format],
                                           :acc_pub_key => acc_pub_key
                                         } }
 end
@@ -251,20 +250,19 @@
   erb :form_get_acc_public_key, { :locals => { :wallets => [@cw.shared.wallets.get(wid)],
                                           :wid => wid,
                                           :index => params[:index],
-                                          :extended => params[:extended],
+                                          :format => params[:format],
                                           :acc_pub_key => nil
                                         } }
 end
 
 post "/shared-get-acc-pub-key" do
   # wallets = @cw.shared.wallets.list
   # handle_api_err wallets, session
-  extended = (params[:extended] == "true") ? true : false
   begin
     acc_pub_key = @cw.shared.keys.create_acc_public_key(params[:wid],
                                             params[:index],
                                             params[:pass],
-                                            extended)
+                                            params[:format])
   rescue
     session[:error] = "Make sure parameters are valid. "
     redirect "/shared-get-acc-pub-key"
@@ -273,7 +271,7 @@
   erb :form_get_acc_public_key, { :locals => { :wallets => [@cw.shared.wallets.get(params[:wid])],
                                           :wid => params[:wid],
                                           :index => params[:index],
-                                          :extended => params[:extended],
+                                          :format => params[:format],
                                           :acc_pub_key => acc_pub_key
                                         } }
 end

diff --git a/views/form_get_acc_public_key.erb b/views/form_get_acc_public_key.erb
@@ -30,10 +30,10 @@
         <small id="help" class="form-text text-muted">Example: 1852H. An individual segment within a derivation path.</small>
       </div>
       <div class="form-group">
-        <label for="role">Extended</label>
-        <select class="form-control" name="extended" id="extended">
-          <option <%= "selected" if extended == "true" %> value="true">true</option>
-          <option <%= "selected" if extended == "false" %> value="false">false</option>
+        <label for="role">Format</label>
+        <select class="form-control" name="format" id="format">
+          <option <%= "selected" if format == "extended" %> value="extended">extended</option>
+          <option <%= "selected" if format == "non_extended" %> value="non_extended">non_extended</option>
         </select>
       </div>
       <div class="form-group">

diff --git a/views/form_get_public_key.erb b/views/form_get_public_key.erb
@@ -30,7 +30,6 @@
           <option <%= "selected" if role == "utxo_external" %> value="utxo_external">utxo_external</option>
           <option <%= "selected" if role == "utxo_internal" %> value="utxo_internal">utxo_internal</option>
           <option <%= "selected" if role == "mutable_account" %> value="mutable_account">mutable_account</option>
-          <option <%= "selected" if role == "multisig_script" %> value="multisig_script">multisig_script</option>
         </select>
       </div>
       <div class="form-group">