Update Wallet Api State Request

Author: physcom

frontend/src/components-ui/Table.js

@@ -6,8 +6,8 @@ export const Table = ({ data, columns, noDataText }) => (
     data={data}
     columns={columns}
     className="-striped"
-    showPagination={false}
-    resizable={false}
+    showPagination={true}
+    resizable={true}
     minRows={1}
     pageSize={data.length}
     noDataText={noDataText}

frontend/src/components/GatewayApplicationWallet.js

@@ -1,6 +1,5 @@
 import React from "react";
-import {Button, Divider, Grid, Icon, Input, Modal, Segment} from "semantic-ui-react";
-import {EtherscanLink} from "../components-ui/EtherscanLink";
+import {Segment} from "semantic-ui-react";
 import {connect} from "react-redux";
 
 
@@ -15,11 +14,17 @@ import {
 import {getGatewayWalletSelector} from "../selectors/getGatewayWalletsSelector";
 
 import {GatewayApplicationWalletRemove} from "./GatewayApplicationWalletRemove";
-import {GatewayApplicationWalletPrivateKey} from "./GatewayApplicationWalletPrivateKey";
 import {WalletImport} from "./GatewayApplicationWalletImport";
 import {OpenScanLink} from "../components-ui/OpenScanLink";
 
 const getColumns = (wallets, onRemove, onExport) => [
+    {
+      Header: 'Wallet Type',
+      accessor: 'walletType',
+      width: 200,
+      Cell: ({ value }) => <span>{value}</span>,
+      sortable: false
+    },
     {
         Header: 'Wallet Address',
         accessor: 'address',
@@ -44,7 +49,7 @@ const getColumns = (wallets, onRemove, onExport) => [
         ),
         sortable: false
     },
-    {
+    /*{
       Header: '',
       accessor: 'address',
       width: 150,
@@ -54,7 +59,7 @@ const getColumns = (wallets, onRemove, onExport) => [
         </span>
       ),
       sortable: false
-    }
+    }*/
 ];
 
 class GatewayApplicationWalletComponent extends React.Component {
@@ -85,7 +90,7 @@ class GatewayApplicationWalletComponent extends React.Component {
         return (
             <div className="table-with-add">
                 <WalletGenerate  gateway={gateway} onSubmit={this.onGenerateWallet} />
-                <WalletImport  gateway={gateway} onSubmit={this.onImportWallet} />
+
                 <Segment attached styles={{ padding: 0 }}>
                     <Table data={wallets.list} columns={columns} noDataText={noDataText} />
                 </Segment>

payment-chooser/build/resources/static/static/js/payment-chooser.js

@@ -6,8 +6,11 @@ import org.springframework.web.client.RestTemplate
 
 
 @Component
-class DefaultKeyApi(private val keyRestTemplate: RestTemplate): KeyApi {
-    override fun generateKey(createKeyRequest: CreateKeyRequest): KeyWalletDto {
+class DefaultKeyApi(
+    private val keyRestTemplate: RestTemplate
+    ): KeyApi {
+
+    override fun generateWallet(createKeyRequest: CreateKeyRequest): KeyWalletDto {
         val response = keyRestTemplate.postForEntity("/key", createKeyRequest, KeyWalletDto::class.java)
         return response.body!!
     }
@@ -17,17 +20,22 @@ class DefaultKeyApi(private val keyRestTemplate: RestTemplate): KeyApi {
         return response.body!!
     }
 
-    override fun generateMultipleKey(createMultipleKeyRequest: CreateMultipleKeyRequest): Array<KeyWalletDto> {
+    override fun generateMultipleWallets(createMultipleKeyRequest: CreateMultipleKeyRequest): Array<KeyWalletDto> {
         val response = keyRestTemplate.postForEntity("/key/multiple", createMultipleKeyRequest, Array<KeyWalletDto>::class.java)
         return response.body!!
     }
 
-    override fun getAllKeysByApplication(applicationId: String): Array<KeyWalletDto> {
+    override fun updateWallets(createMultipleKeyRequest: CreateMultipleKeyRequest): Array<KeyWalletDto> {
+        val response = keyRestTemplate.postForEntity("/key/update", createMultipleKeyRequest, Array<KeyWalletDto>::class.java)
+        return response.body!!
+    }
+
+    override fun getAllWalletsByApplication(applicationId: String): Array<KeyWalletDto> {
         val response = keyRestTemplate.getForEntity("/key?applicationId={applicationId}", Array<KeyWalletDto>::class.java, applicationId)
         return response.body!!
     }
 
-    override fun getAllKeysByOrderKey(orderKey: String): Array<KeyWalletDto> {
+    override fun getAllWalletsByOrderKey(orderKey: String): Array<KeyWalletDto> {
         val url = "/key/order/${orderKey}"
         val response = keyRestTemplate.getForEntity(url, Array<KeyWalletDto>::class.java)
         return response.body!!
@@ -38,7 +46,7 @@ class DefaultKeyApi(private val keyRestTemplate: RestTemplate): KeyApi {
         return response.body!!
     }
 
-    override fun deleteAllKeysByApplicationAddress(applicationId: String, address: String) {
+    override fun deleteAllWalletsByApplicationAddress(applicationId: String, address: String) {
         val url = "/key?applicationId=${applicationId}&address=${address}"
         keyRestTemplate.delete(url)
     }

payment-chooser/build/resources/static/static/js/payment-chooser.js.map

@@ -3,12 +3,13 @@ package io.openfuture.api.component.key
 import io.openfuture.api.domain.key.*
 
 interface KeyApi {
-    fun generateKey(createKeyRequest: CreateKeyRequest): KeyWalletDto
+    fun generateWallet(createKeyRequest: CreateKeyRequest): KeyWalletDto
     fun importWallet(request: ImportKeyRequest): KeyWalletDto
-    fun generateMultipleKey(createMultipleKeyRequest: CreateMultipleKeyRequest): Array<KeyWalletDto>
-    fun getAllKeysByApplication(applicationId: String): Array<KeyWalletDto>
-    fun getAllKeysByOrderKey(orderKey: String): Array<KeyWalletDto>
+    fun generateMultipleWallets(createMultipleKeyRequest: CreateMultipleKeyRequest): Array<KeyWalletDto>
+    fun updateWallets(createMultipleKeyRequest: CreateMultipleKeyRequest): Array<KeyWalletDto>
+    fun getAllWalletsByApplication(applicationId: String): Array<KeyWalletDto>
+    fun getAllWalletsByOrderKey(orderKey: String): Array<KeyWalletDto>
     fun getApplicationByAddress(address: String): WalletAddressResponse
-    fun deleteAllKeysByApplicationAddress(applicationId: String, address: String)
+    fun deleteAllWalletsByApplicationAddress(applicationId: String, address: String)
     fun exportPrivateKey(keyWalletDto: KeyWalletDto): String
 }

payment-chooser/build/static/js/payment-chooser.js

@@ -1,44 +1,41 @@
 package io.openfuture.api.component.state
 
-import io.openfuture.api.domain.key.KeyWalletDto
+import io.openfuture.api.domain.state.WalletApiStateResponse
 import io.openfuture.api.domain.state.*
 import io.openfuture.api.domain.transaction.TransactionDto
 import io.openfuture.api.domain.widget.PaymentWidgetResponse
 import io.openfuture.api.entity.state.Blockchain
-import io.openfuture.api.util.getOrderKey
-import io.openfuture.api.util.getRandomNumber
 import org.springframework.stereotype.Component
 import org.springframework.web.client.RestTemplate
-import java.math.BigDecimal
 
 @Component
 class DefaultStateApi(private val stateRestTemplate: RestTemplate) : StateApi {
 
-    override fun createWallet(address: String, webHook: String, blockchain: Blockchain): CreateStateWalletResponse {
-        val request = CreateStateWalletRequestMetadata(
-            webHook,
-            listOf(KeyWalletDto(address, blockchain.getValue())),
-            WalletMetaData(
-                "0",
-                "1000",
-                "op_UxQr1LLdREboF",
-                "USD",
-                "open",
-                false
-            )
-        )
-        return stateRestTemplate.postForEntity("/wallets", request, CreateStateWalletResponse::class.java).body!!
+    override fun createWallet(address: String, webHook: String, blockchain: Blockchain, applicationId: String): StateWalletDto {
+        val request = CreateStateWalletRequest(address, webHook, blockchain.getValue(), applicationId)
+        println("Blockchain : $blockchain")
+        val response = stateRestTemplate.postForEntity("/wallets/single", request, StateWalletDto::class.java)
+        return response.body!!
     }
 
     override fun createWalletWithMetadata(request: CreateStateWalletRequestMetadata): CreateStateWalletResponse {
         return stateRestTemplate.postForEntity("/wallets", request, CreateStateWalletResponse::class.java).body!!
     }
 
+    override fun updateWalletWithMetadata(request: UpdateStateWalletMetadata) {
+        stateRestTemplate.postForEntity("/wallets/update", request, Void::class.java)
+    }
+
     override fun deleteWallet(address: String, blockchain: Blockchain) {
         val url = "/wallets/blockchain/${blockchain.getValue()}/address/${address}"
         stateRestTemplate.delete(url)
     }
 
+    override fun getWallet(address: String, blockchain: Blockchain): WalletApiStateResponse {
+        val url = "/wallets/blockchain/${blockchain.getValue()}/address/${address}"
+        return stateRestTemplate.getForEntity(url, WalletApiStateResponse::class.java).body!!
+    }
+
     override fun getAddressTransactionsByAddress(address: String): StateWalletTransactionDetail {
         val url = "/wallets/transactions/address/${address}"
         return stateRestTemplate.getForEntity(url, StateWalletTransactionDetail::class.java).body!!

payment-chooser/build/static/js/payment-chooser.js.map

@@ -1,18 +1,23 @@
 package io.openfuture.api.component.state
 
+import io.openfuture.api.domain.state.WalletApiStateResponse
 import io.openfuture.api.domain.state.*
 import io.openfuture.api.domain.transaction.TransactionDto
 import io.openfuture.api.domain.widget.PaymentWidgetResponse
 import io.openfuture.api.entity.state.Blockchain
 
 interface StateApi {
 
-    fun createWallet(address: String, webHook: String, blockchain: Blockchain): CreateStateWalletResponse
+    fun createWallet(address: String, webHook: String, blockchain: Blockchain, applicationId: String): StateWalletDto
 
     fun createWalletWithMetadata(request: CreateStateWalletRequestMetadata): CreateStateWalletResponse
 
+    fun updateWalletWithMetadata(request: UpdateStateWalletMetadata)
+
     fun deleteWallet(address: String, blockchain: Blockchain)
 
+    fun getWallet(address: String, blockchain: Blockchain): WalletApiStateResponse
+
     fun getAddressTransactionsByAddress(address: String): StateWalletTransactionDetail
 
     fun getTransactionsByAddress(address: String): Array<TransactionDto>