Feat/ithaca

android/app/build.gradle

@@ -66,7 +66,7 @@ dependencies {
     implementation project(':capacitor-cordova-android-plugins')
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
-    def saplingVersion = "0.0.6"
+    def saplingVersion = "0.0.7"
     implementation "com.github.airgap-it:airgap-sapling:$saplingVersion"
 }
 

ios/App/App.xcodeproj/project.pbxproj

@@ -493,7 +493,7 @@
 			repositoryURL = "https://github.com/airgap-it/airgap-sapling.git";
 			requirement = {
 				kind = upToNextMajorVersion;
-				minimumVersion = 0.0.6;
+				minimumVersion = 0.0.7;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */

ios/App/App.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -1,16 +1,14 @@
 {
-  "object": {
-    "pins": [
-      {
-        "package": "AirGapSapling",
-        "repositoryURL": "https://github.com/airgap-it/airgap-sapling.git",
-        "state": {
-          "branch": null,
-          "revision": "c6606fce5d84cea678414681b13ef5efb3629a7e",
-          "version": "0.0.6"
-        }
+  "pins" : [
+    {
+      "identity" : "airgap-sapling",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/airgap-it/airgap-sapling.git",
+      "state" : {
+        "revision" : "00848f05c305c9997c8f7325527ddc20de7edd2b",
+        "version" : "0.0.7"
       }
-    ]
-  },
-  "version": 1
+    }
+  ],
+  "version" : 2
 }

package.json

@@ -54,11 +54,11 @@
     }
   },
   "dependencies": {
-    "@airgap/angular-core": "0.0.27-beta.4",
-    "@airgap/angular-ngrx": "0.0.27-beta.4",
+    "@airgap/angular-core": "0.0.27",
+    "@airgap/angular-ngrx": "0.0.27",
     "@airgap/beacon-sdk": "2.3.8",
-    "@airgap/coinlib-core": "0.12.10-beta.4",
-    "@airgap/sapling-wasm": "0.0.6",
+    "@airgap/coinlib-core": "0.13.0",
+    "@airgap/sapling-wasm": "0.0.7",
     "@angular/animations": "^11.2.9",
     "@angular/common": "^11.2.9",
     "@angular/core": "^11.2.9",

src/app/app.component.ts

@@ -218,6 +218,20 @@ export class AppComponent implements AfterViewInit {
     )
     const hangzhounetProtocol: TezosProtocol = new TezosProtocol(new TezosProtocolOptions(hangzhounetNetwork))
 
+    const ithacanetNetwork: TezosProtocolNetwork = new TezosProtocolNetwork(
+      'Ithacanet',
+      NetworkType.TESTNET,
+      'https://tezos-ithacanet-node.prod.gke.papers.tech',
+      new TezblockBlockExplorer('https//ithacanet.tezblock.io'),
+      new TezosProtocolNetworkExtras(
+        TezosNetwork.ITHACANET,
+        'https://tezos-ithacanet-conseil.prod.gke.papers.tech',
+        TezosNetwork.ITHACANET,
+        'airgap00391'
+      )
+    )
+    const ithacanetProtocol: TezosProtocol = new TezosProtocol(new TezosProtocolOptions(ithacanetNetwork))
+
     const externalMethodProvider:
       | TezosSaplingExternalMethodProvider
       | undefined = await this.saplingNativeService.createExternalMethodProvider()
@@ -237,8 +251,8 @@ export class AppComponent implements AfterViewInit {
     )
 
     this.protocolService.init({
-      extraActiveProtocols: [shieldedTezProtocol, hangzhounetProtocol, shieldedTezProtocolTestnet],
-      extraPassiveSubProtocols: [[hangzhounetProtocol, new TezosKtProtocol(new TezosProtocolOptions(hangzhounetNetwork))]]
+      extraActiveProtocols: [ithacanetProtocol, shieldedTezProtocol, hangzhounetProtocol, shieldedTezProtocolTestnet],
+      extraPassiveSubProtocols: [[hangzhounetProtocol, new TezosKtProtocol(new TezosProtocolOptions(hangzhounetNetwork))], [ithacanetProtocol, new TezosKtProtocol(new TezosProtocolOptions(ithacanetNetwork))]]
     })
 
     await Promise.all([this.getGenericSubProtocols(), this.initializeTezosDomains()])
@@ -324,9 +338,7 @@ export class AppComponent implements AfterViewInit {
   private async initializeTezosDomains(): Promise<void> {
     const tezosDomainsAddresses: Record<TezosNetwork, string | undefined> = {
       [TezosNetwork.MAINNET]: 'KT1GBZmSxmnKJXGMdMLbugPfLyUPmuLSMwKS',
-      [TezosNetwork.EDONET]: 'KT1JJbWfW8CHUY95hG9iq2CEMma1RiKhMHDR',
-      [TezosNetwork.FLORENCENET]: 'KT1PfBfkfUuvQRN8zuCAyp5MHjNrQqgevS9p',
-      [TezosNetwork.GRANADANET]: 'KT1Ch6PstAQG32uNfQJUSL2bf2WvimvY5umk',
+      [TezosNetwork.ITHACANET]: undefined,
       [TezosNetwork.HANGZHOUNET]: 'KT1MgQjmWMBQ4LyuMAqZccTkMSUJbEXeGqii',
     }
 

src/app/extensions/delegation/TezosDelegationExtensions.ts

@@ -2,7 +2,7 @@ import { AddressService, AmountConverterPipe } from '@airgap/angular-core'
 import { DecimalPipe } from '@angular/common'
 import { FormBuilder, FormGroup } from '@angular/forms'
 import { TranslateService } from '@ngx-translate/core'
-import { DelegationInfo, TezosDelegatorAction, TezosProtocol } from '@airgap/coinlib-core'
+import { /*DelegationInfo, */TezosDelegatorAction, TezosProtocol } from '@airgap/coinlib-core'
 import { DelegateeDetails, DelegatorAction, DelegatorDetails } from '@airgap/coinlib-core/protocols/ICoinDelegateProtocol'
 import { NetworkType } from '@airgap/coinlib-core/utils/ProtocolNetwork'
 import BigNumber from 'bignumber.js'
@@ -28,7 +28,7 @@ export class TezosDelegationExtensions extends ProtocolDelegationExtensions<Tezo
   public static async create(
     coinlibService: CoinlibService,
     decimalPipe: DecimalPipe,
-    amountConverter: AmountConverterPipe,
+    _amountConverter: AmountConverterPipe,
     shortenStringPipe: ShortenStringPipe,
     translateService: TranslateService,
     addressService: AddressService,
@@ -38,7 +38,7 @@ export class TezosDelegationExtensions extends ProtocolDelegationExtensions<Tezo
       TezosDelegationExtensions.instance = new TezosDelegationExtensions(
         coinlibService,
         decimalPipe,
-        amountConverter,
+        // amountConverter,
         shortenStringPipe,
         translateService,
         addressService,
@@ -66,7 +66,7 @@ export class TezosDelegationExtensions extends ProtocolDelegationExtensions<Tezo
   private constructor(
     private readonly coinlibService: CoinlibService,
     private readonly decimalPipe: DecimalPipe,
-    private readonly amountConverterPipe: AmountConverterPipe,
+    // private readonly amountConverterPipe: AmountConverterPipe,
     private readonly shortenStringPipe: ShortenStringPipe,
     private readonly translateService: TranslateService,
     private readonly addressService: AddressService,
@@ -187,10 +187,11 @@ export class TezosDelegationExtensions extends ProtocolDelegationExtensions<Tezo
     }
   }
 
-  public async getRewardDisplayDetails(protocol: TezosProtocol, delegator: string): Promise<UIRewardList | undefined> {
-    const delegatorExtraInfo = await protocol.getDelegationInfo(delegator)
+  public async getRewardDisplayDetails(_protocol: TezosProtocol, _delegator: string): Promise<UIRewardList | undefined> {
+    return undefined
+    // const delegatorExtraInfo = await protocol.getDelegationInfo(delegator)
 
-    return this.createDelegatorDisplayRewards(protocol, delegator, delegatorExtraInfo).catch(() => undefined)
+    // return this.createDelegatorDisplayRewards(protocol, delegator, delegatorExtraInfo).catch(() => undefined)
   }
 
   private createDelegateeDisplayDetails(protocol: TezosProtocol, baker?: TezosBakerDetails): UIWidget[] {
@@ -252,34 +253,34 @@ export class TezosDelegationExtensions extends ProtocolDelegationExtensions<Tezo
       : null
   }
 
-  private async createDelegatorDisplayRewards(
-    protocol: TezosProtocol,
-    address: string,
-    delegatorExtraInfo: DelegationInfo
-  ): Promise<UIRewardList | undefined> {
-    if (!delegatorExtraInfo.isDelegated || !delegatorExtraInfo.value) {
-      return undefined
-    }
-    const rewardInfo = await protocol.getDelegationRewards(delegatorExtraInfo.value, address)
-
-    return new UIRewardList({
-      rewards: await Promise.all(
-        rewardInfo.map(async (info) => {
-          return {
-            index: info.cycle,
-            amount: await this.amountConverterPipe.transform(new BigNumber(info.reward), {
-              protocol
-            }),
-            collected: info.payout < new Date(),
-            timestamp: info.payout.getTime()
-          }
-        })
-      ),
-      indexColLabel: 'delegation-detail-tezos.rewards.index-col_label',
-      amountColLabel: 'delegation-detail-tezos.rewards.amount-col_label',
-      payoutColLabel: 'delegation-detail-tezos.rewards.payout-col_label'
-    })
-  }
+  // private async createDelegatorDisplayRewards(
+  //   protocol: TezosProtocol,
+  //   address: string,
+  //   delegatorExtraInfo: DelegationInfo
+  // ): Promise<UIRewardList | undefined> {
+  //   if (!delegatorExtraInfo.isDelegated || !delegatorExtraInfo.value) {
+  //     return undefined
+  //   }
+  //   const rewardInfo = await protocol.getDelegationRewards(delegatorExtraInfo.value, address)
+
+  //   return new UIRewardList({
+  //     rewards: await Promise.all(
+  //       rewardInfo.map(async (info) => {
+  //         return {
+  //           index: info.cycle,
+  //           amount: await this.amountConverterPipe.transform(new BigNumber(info.reward), {
+  //             protocol
+  //           }),
+  //           collected: info.payout < new Date(),
+  //           timestamp: info.payout.getTime()
+  //         }
+  //       })
+  //     ),
+  //     indexColLabel: 'delegation-detail-tezos.rewards.index-col_label',
+  //     amountColLabel: 'delegation-detail-tezos.rewards.amount-col_label',
+  //     payoutColLabel: 'delegation-detail-tezos.rewards.payout-col_label'
+  //   })
+  // }
 
   private async getKnownBakers(): Promise<TezosBakerCollection> {
     if (this.knownBakers === undefined) {