* 0.10.1 fix pathfinder responses (always output as Circles)

* make registerHumanV2 private
aboutcircles · Sep 20, 2024 · ce459fd · ce459fd
1 parent 5fe024b
commit ce459fd
Show file tree

Hide file tree

Showing 20 changed files with 66 additions and 52 deletions.
diff --git a/package.json b/package.json
@@ -36,5 +36,5 @@
   },
   "name": "@cirlces-sdk/root",
   "license": "MIT",
-  "version": "0.10.0"
+  "version": "0.10.1"
 }
diff --git a/packages/abi-v1/package.json b/packages/abi-v1/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@circles-sdk/abi-v1",
-  "version": "0.10.0",
+  "version": "0.10.1",
   "description": "",
   "type": "module",
   "main": "./dist/index.js",

diff --git a/packages/abi-v2/package.json b/packages/abi-v2/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@circles-sdk/abi-v2",
-  "version": "0.10.0",
+  "version": "0.10.1",
   "description": "",
   "type": "module",
   "main": "./dist/index.js",

diff --git a/packages/adapter-cometh/package.json b/packages/adapter-cometh/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@circles-sdk/adapter-cometh",
-  "version": "0.10.0",
+  "version": "0.10.1",
   "description": "",
   "type": "module",
   "main": "./dist/index.js",
@@ -17,7 +17,7 @@
     "build": "rollup -c"
   },
   "dependencies": {
-    "@circles-sdk/adapter": "0.10.0",
+    "@circles-sdk/adapter": "0.10.1",
     "@cometh/connect-sdk": "1.2.29"
   },
   "keywords": [],

diff --git a/packages/adapter-cometh/src/index.ts b/packages/adapter-cometh/src/index.ts
@@ -70,7 +70,7 @@ export class ComethSdkContractRunner implements SdkContractRunner {
       chainId: network.chainId
     };
   };
-  sendBatchTransaction?: () => BatchRun = () => {
+  sendBatchTransaction()  {
     return new ComethBatchRun(this.comethWallet);
   }
 }

diff --git a/packages/adapter-ethers/package.json b/packages/adapter-ethers/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@circles-sdk/adapter-ethers",
-  "version": "0.10.0",
+  "version": "0.10.1",
   "description": "",
   "type": "module",
   "main": "./dist/index.js",
@@ -18,7 +18,7 @@
   },
   "dependencies": {
     "ethers": "^6.13.2",
-    "@circles-sdk/adapter": "0.10.0"
+    "@circles-sdk/adapter": "0.10.1"
   },
   "keywords": [],
   "author": "",

diff --git a/packages/adapter-ethers/src/index.ts b/packages/adapter-ethers/src/index.ts
@@ -206,4 +206,11 @@ export class SdkContractRunnerWrapper implements EthersContractRunner {
 
     return <SdkTransactionResponse><unknown>{...transactionResponse};
   };
+  sendBatchTransaction() {
+    if (!this.sdkContractRunner.sendBatchTransaction) {
+      throw new Error('sendBatchTransaction not supported');
+    }
+
+    return this.sdkContractRunner.sendBatchTransaction();
+  }
 }
diff --git a/packages/adapter-safe-app/package.json b/packages/adapter-safe-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@circles-sdk/adapter-safe-app",
-  "version": "0.10.0",
+  "version": "0.10.1",
   "description": "",
   "type": "module",
   "main": "./dist/index.js",
@@ -17,7 +17,7 @@
     "build": "rollup -c"
   },
   "dependencies": {
-    "@circles-sdk/adapter": "0.10.0",
+    "@circles-sdk/adapter": "0.10.1",
     "@safe-global/safe-apps-sdk": "^9.1.0"
   },
   "keywords": [],

diff --git a/packages/adapter-safe/package.json b/packages/adapter-safe/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@circles-sdk/adapter-safe",
-  "version": "0.10.0",
+  "version": "0.10.1",
   "description": "",
   "type": "module",
   "main": "./dist/index.js",

diff --git a/packages/adapter/package.json b/packages/adapter/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@circles-sdk/adapter",
-  "version": "0.10.0",
+  "version": "0.10.1",
   "description": "",
   "type": "module",
   "main": "./dist/index.js",

diff --git a/packages/data/package.json b/packages/data/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@circles-sdk/data",
-  "version": "0.10.0",
+  "version": "0.10.1",
   "description": "",
   "type": "module",
   "main": "./dist/index.js",
@@ -17,7 +17,7 @@
     "build": "rollup -c"
   },
   "dependencies": {
-    "@circles-sdk/utils": "0.10.0"
+    "@circles-sdk/utils": "0.10.1"
   },
   "keywords": [],
   "author": "",

diff --git a/packages/data/src/circlesData.ts b/packages/data/src/circlesData.ts
@@ -561,7 +561,7 @@ export class CirclesData implements CirclesDataInterface {
     );
     return parseRpcSubscriptionMessage(response.result);
   }
-
+  
   /**
    * Gets the invitations sent by an avatar.
    * @param avatar The avatar to get the invitations for.

diff --git a/packages/profiles/package.json b/packages/profiles/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@circles-sdk/profiles",
-  "version": "0.10.0",
+  "version": "0.10.1",
   "description": "",
   "type": "module",
   "main": "./dist/index.js",
@@ -17,7 +17,7 @@
     "build": "rollup -c"
   },
   "dependencies": {
-    "@circles-sdk/utils": "0.10.0"
+    "@circles-sdk/utils": "0.10.1"
   },
   "keywords": [],
   "author": "",

diff --git a/packages/sdk/package.json b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@circles-sdk/sdk",
-  "version": "0.10.0",
+  "version": "0.10.1",
   "description": "",
   "type": "module",
   "main": "./dist/index.js",
@@ -17,11 +17,11 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@circles-sdk/abi-v1": "0.10.0",
-    "@circles-sdk/abi-v2": "0.10.0",
-    "@circles-sdk/data": "0.10.0",
-    "@circles-sdk/profiles": "0.10.0",
-    "@circles-sdk/adapter-ethers": "0.10.0",
+    "@circles-sdk/abi-v1": "0.10.1",
+    "@circles-sdk/abi-v2": "0.10.1",
+    "@circles-sdk/data": "0.10.1",
+    "@circles-sdk/profiles": "0.10.1",
+    "@circles-sdk/adapter-ethers": "0.10.1",
     "ethers": "^6.13.2",
     "multihashes": "^4.0.3"
   },

diff --git a/packages/sdk/src/AvatarInterface.ts b/packages/sdk/src/AvatarInterface.ts
@@ -30,7 +30,7 @@ export interface AvatarInterface {
    * @param tokenId The token to transfer (address). Leave empty to allow transitive transfers.
    * @returns The maximum amount that can be transferred.
    */
-  getMaxTransferableAmount(to: string, tokenId?: string): Promise<bigint>;
+  getMaxTransferableAmount(to: string, tokenId?: string): Promise<number>;
 
   /**
    * Transfers Circles to another avatar.

diff --git a/packages/sdk/src/avatar.ts b/packages/sdk/src/avatar.ts
@@ -154,7 +154,7 @@ export class Avatar implements AvatarInterfaceV2 {
    * @param tokenId The token ID to transfer. If not specified, a transitve transfer is calculated.
    * @returns The maximum Circles amount that can be transferred.
    */
-  getMaxTransferableAmount = (to: string, tokenId?: string): Promise<bigint> => this.onlyIfInitialized(() => this._avatar!.getMaxTransferableAmount(to, tokenId));
+  getMaxTransferableAmount = (to: string, tokenId?: string): Promise<number> => this.onlyIfInitialized(() => this._avatar!.getMaxTransferableAmount(to, tokenId));
 
   /**
    * Transfers Circles to another avatar.

diff --git a/packages/sdk/src/sdk.ts b/packages/sdk/src/sdk.ts
@@ -65,20 +65,20 @@ interface SdkInterface {
    * @returns The Avatar instance.
    */
   registerHuman: () => Promise<AvatarInterface>;
-
-  /**
-   * Registers the connected wallet as a human avatar in Circles v2 and creates a profile.
-   * @param profile The profile data of the avatar.
-   * @returns The Avatar instance.
-   */
-  registerHumanV2(profile: Profile): Promise<AvatarInterface>;
-
-  /**
-   * Registers the connected wallet as a human avatar in Circles v2 and using an existing CID as profile.
-   * @param cidV0 The CIDv0 of the avatar's ERC1155 token metadata.
-   * @returns The Avatar instance.
-   */
-  registerHumanV2(cidV0: string): Promise<AvatarInterface>;
+  //
+  // /**
+  //  * Registers the connected wallet as a human avatar in Circles v2 and creates a profile.
+  //  * @param profile The profile data of the avatar.
+  //  * @returns The Avatar instance.
+  //  */
+  // registerHumanV2(profile: Profile): Promise<AvatarInterface>;
+
+  // /**
+  //  * Registers the connected wallet as a human avatar in Circles v2 and using an existing CID as profile.
+  //  * @param cidV0 The CIDv0 of the avatar's ERC1155 token metadata.
+  //  * @returns The Avatar instance.
+  //  */
+  // registerHumanV2(cidV0: string): Promise<AvatarInterface>;
 
   /**
    * Registers the connected wallet as an organization avatar in Circles v1.
@@ -219,20 +219,20 @@ export class Sdk implements SdkInterface {
    * @param profile The profile data of the avatar.
    * @returns The Avatar instance.
    */
-  registerHumanV2(profile: Profile): Promise<AvatarInterface>;
+  private registerHumanV2(profile: Profile): Promise<AvatarInterface>;
   /**
    * Registers the connected wallet as a human avatar in Circles v2 using an existing CID as profile.
    * Note: This will only work if you already have a v1 avatar and only during the migration period.
    *      The only way to join after the migration period is to be invited by an existing member.
    * @param cidV0 The CIDv0 of the avatar's ERC1155 token metadata.
    * @returns The Avatar instance.
    */
-  registerHumanV2(cidV0: string): Promise<AvatarInterface>;
+  private registerHumanV2(cidV0: string): Promise<AvatarInterface>;
   /**
    * Registers the connected wallet as a human avatar in Circles v2.
    * @param profile The profile data of the avatar.
    */
-  async registerHumanV2(profile: Profile | string): Promise<AvatarInterface> {
+  private async registerHumanV2(profile: Profile | string): Promise<AvatarInterface> {
     return this._registerHuman(ZeroAddress, profile);
   };
 

diff --git a/packages/sdk/src/v1/v1Avatar.ts b/packages/sdk/src/v1/v1Avatar.ts
@@ -58,7 +58,7 @@ export class V1Avatar implements AvatarInterface {
    * @param tokenId The token to transfer (address). Leave empty to allow transitive transfers.
    * @returns The max. transferable amount at the time.
    */
-  async getMaxTransferableAmount(to: string, tokenId?: string): Promise<bigint> {
+  async getMaxTransferableAmount(to: string, tokenId?: string): Promise<number> {
     this.throwIfNotInitialized();
 
     if (tokenId) {
@@ -68,8 +68,8 @@ export class V1Avatar implements AvatarInterface {
       }
 
       const tokenBalances = await this.sdk.data.getTokenBalances(this.address);
-      const tokenBalance = tokenBalances.filter(b => b.version === 1 && b.tokenAddress === tokenId)[0]?.attoCircles;
-      return BigInt(tokenBalance ?? "0");
+      const tokenBalance = tokenBalances.filter(b => b.version === 1 && b.tokenAddress === tokenId)[0]?.circles;
+      return tokenBalance ?? "0";
     }
 
     this.throwIfPathfinderIsNotAvailable();
@@ -81,10 +81,10 @@ export class V1Avatar implements AvatarInterface {
       largeAmount);
 
     if (!transferPath.isValid) {
-      return Promise.resolve(BigInt(0));
+      return 0;
     }
 
-    return transferPath.maxFlow;
+    return crcToTc(new Date(), transferPath.maxFlow);
   }
 
   /**
@@ -108,6 +108,8 @@ export class V1Avatar implements AvatarInterface {
         throw new Error(`Couldn't find a valid path from ${this.address} to ${to} for ${amount}.`);
       }
 
+      console.log('transferPath', transferPath);
+
       const tokenOwners = transferPath.transferSteps.map(o => o.token_owner);
       const srcs = transferPath.transferSteps.map(o => o.from);
       const dests = transferPath.transferSteps.map(o => o.to);

diff --git a/packages/sdk/src/v2/v2Avatar.ts b/packages/sdk/src/v2/v2Avatar.ts
@@ -4,6 +4,7 @@ import {
 } from 'ethers';
 import {Sdk} from '../sdk';
 import {
+  attoCirclesToCircles,
   AvatarRow,
   CirclesQuery,
   TokenBalanceRow,
@@ -71,7 +72,7 @@ export class V2Avatar implements AvatarInterfaceV2 {
     return receipt;
   }
 
-  async getMaxTransferableAmount(to: string, tokenId?: string): Promise<bigint> {
+  async getMaxTransferableAmount(to: string, tokenId?: string): Promise<number> {
     this.throwIfV2IsNotAvailable();
 
     if (tokenId) {
@@ -82,7 +83,7 @@ export class V2Avatar implements AvatarInterfaceV2 {
 
       const tokenBalances = await this.sdk.data.getTokenBalances(this.address);
       const tokenBalance = tokenBalances.filter(b => b.version === 2 && b.tokenOwner.toString() === tokenInfo.token.toString())[0];
-      return BigInt(tokenBalance?.attoCircles ?? "0");
+      return tokenBalance?.circles ?? 0;
     }
 
     const largeAmount = BigInt('79228162514264337593543950335');
@@ -91,11 +92,15 @@ export class V2Avatar implements AvatarInterfaceV2 {
       to,
       largeAmount);
 
+    if (transferPath.transferSteps.length == 0) {
+      return 0;
+    }
+
     if (!transferPath.isValid) {
-      return Promise.resolve(BigInt(0));
+      return 0;
     }
 
-    return transferPath.maxFlow;
+    return attoCirclesToCircles(transferPath.maxFlow);
   }
 
   async getMintableAmount(): Promise<number> {

diff --git a/packages/utils/package.json b/packages/utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@circles-sdk/utils",
-  "version": "0.10.0",
+  "version": "0.10.1",
   "description": "",
   "type": "module",
   "main": "./dist/index.js",
-Original file line number
+Diff line change
@@ Expand Up / @@ -561,7 +561,7 @@ export class CirclesData implements CirclesDataInterface { @@
         );
         return parseRpcSubscriptionMessage(response.result);
       }
       /**
        * Gets the invitations sent by an avatar.
        * @param avatar The avatar to get the invitations for.
@@ Expand Down @@