Merge pull request #46 from airgap-it/feat/update-coinlib-core

chore(): update @airgap/coinlib-core
airgap-it · May 21, 2021 · 4963641 · 4963641
2 parents 6e5924d + 18eea9f
commit 4963641
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 21 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "spire",
-  "version": "2.2.2",
+  "version": "2.2.3",
   "author": "AirGap",
   "homepage": "https://airgap.it/",
   "scripts": {
@@ -26,7 +26,7 @@
   "private": true,
   "dependencies": {
     "@airgap/beacon-sdk": "2.2.5",
-    "@airgap/coinlib-core": "0.10.6",
+    "@airgap/coinlib-core": "0.11.2-beta.1",
     "@angular/common": "^11.0.3",
     "@angular/core": "^11.0.3",
     "@angular/forms": "^11.0.3",

diff --git a/src/app/services/local-wallet.service.ts b/src/app/services/local-wallet.service.ts
@@ -136,7 +136,7 @@ export class WalletService {
 
     const publicKey: string = await protocol.getPublicKeyFromMnemonic(mnemonic, protocol.standardDerivationPath)
 
-    const address: string = await protocol.getAddressFromPublicKey(publicKey)
+    const address: string = (await protocol.getAddressFromPublicKey(publicKey)).getValue()
 
     return {
       privateKey,

diff --git a/src/app/services/settings.service.ts b/src/app/services/settings.service.ts
@@ -67,16 +67,14 @@ export class SettingsService {
       [NetworkType.FLORENCENET]: AirGapNetworkType.TESTNET,
       [NetworkType.CUSTOM]: AirGapNetworkType.CUSTOM
     }
-    const blockExplorers: { [key in NetworkType]: string } = {
+    const blockExplorers: { [key in Exclude<NetworkType, NetworkType.DELPHINET>]: string } = {
       [NetworkType.MAINNET]: 'https://tezblock.io',
-      [NetworkType.DELPHINET]: 'https://delphinet.tezblock.io',
       [NetworkType.EDONET]: 'https://edonet.tezblock.io',
       [NetworkType.FLORENCENET]: 'https://florencenet.tezblock.io',
       [NetworkType.CUSTOM]: 'https://florencenet.tezblock.io'
     }
-    const tezosNetworks: { [key in NetworkType]: TezosNetwork } = {
+    const tezosNetworks: { [key in Exclude<NetworkType, NetworkType.DELPHINET>]: TezosNetwork } = {
       [NetworkType.MAINNET]: TezosNetwork.MAINNET,
-      [NetworkType.DELPHINET]: TezosNetwork.DELPHINET,
       [NetworkType.EDONET]: TezosNetwork.EDONET,
       [NetworkType.FLORENCENET]: TezosNetwork.EDONET, // TODO: UPDATE IN COINLIB
       [NetworkType.CUSTOM]: TezosNetwork.EDONET

diff --git a/src/extension/AirGapSigner.ts b/src/extension/AirGapSigner.ts
@@ -22,7 +22,7 @@ export class AirGapOperationProvider implements OperationProvider {
   ): Promise<TezosWrappedOperation> {
     const protocol: TezosProtocol = await getProtocolForNetwork(network)
 
-    return protocol.prepareOperations(publicKey, operations as any) // TODO: Fix type
+    return protocol.prepareOperations(publicKey, operations as any, false) // don't override parameters // TODO: Fix type
   }
 
   public async forgeWrappedOperation(wrappedOperation: TezosWrappedOperation, network: Network): Promise<string> {

diff --git a/src/extension/extension-client/utils.ts b/src/extension/extension-client/utils.ts
@@ -58,10 +58,9 @@ export const getProtocolForNetwork: (network: Network) => Promise<TezosProtocol>
     [NetworkType.EDONET]: 'https://edonet.tezblock.io',
     [NetworkType.FLORENCENET]: 'https://florencenet.tezblock.io',
     [NetworkType.CUSTOM]: 'https://florencenet.tezblock.io'
-}
-  const tezosNetworks: { [key in NetworkType]: TezosNetwork } = {
+  }
+  const tezosNetworks: { [key in Exclude<NetworkType, NetworkType.DELPHINET>]: TezosNetwork } = {
     [NetworkType.MAINNET]: TezosNetwork.MAINNET,
-    [NetworkType.DELPHINET]: TezosNetwork.DELPHINET,
     [NetworkType.EDONET]: TezosNetwork.EDONET,
     [NetworkType.FLORENCENET]: TezosNetwork.EDONET, // TODO: UPDATE IN COINLIB
     [NetworkType.CUSTOM]: TezosNetwork.EDONET

diff --git a/src/manifest.json b/src/manifest.json
@@ -1,6 +1,6 @@
 {
   "name": "Spire",
-  "version": "2.2.2",
+  "version": "2.2.3",
   "description": "Spire allows you to interact with Tezos dApps that support the Beacon SDK.",
   "icons": {
     "16": "assets/icon/spire-logo-16px.png",