@cityofzion/bs-neo3 0.8.0 → 0.9.1

package/.rush/temp/operation/build/state.json

@@ -1,3 +1,3 @@
 {
-  "nonCachedDurationMs": 2137.4206459999987
+  "nonCachedDurationMs": 2202.782708999992
 }

package/.rush/temp/package-deps_build.json

@@ -1,16 +1,18 @@
 {
   "files": {
+    "packages/bs-neo3/CHANGELOG.json": "3f3d2b73b8c94585680bd6eea606e773f1cfebd4",
+    "packages/bs-neo3/CHANGELOG.md": "b151fbc882d1607cdba6f031e47199ffc331ff04",
     "packages/bs-neo3/jest.config.ts": "d944475db93cbe41a9339187fd94b9962e411c43",
     "packages/bs-neo3/jest.setup.ts": "9a1976a32050616d4d2ee95b1aa21041bc4daca3",
-    "packages/bs-neo3/package.json": "73982aa01341d1bfca928b3ad79fafeddb8fe5eb",
-    "packages/bs-neo3/src/BSNeo3.ts": "ac017ee69800b8bf170face0e9e38bb72d8ad2a3",
-    "packages/bs-neo3/src/DoraBDSNeo3.ts": "7891be397db816f811631e56c1abf32bbd0b2a36",
+    "packages/bs-neo3/package.json": "ae7b212ffc3e029c08d9770feb0ca8b82bca2a77",
+    "packages/bs-neo3/src/BSNeo3.ts": "e7235ac3cb4cef569443b4fbef6cb787972de25b",
+    "packages/bs-neo3/src/DoraBDSNeo3.ts": "97e90b38cc18fa6376f4c7bb5996d88c57efa5bc",
     "packages/bs-neo3/src/DoraESNeo3.ts": "c3d36ee5c38cda45c08f517c49976af6d69c5711",
     "packages/bs-neo3/src/FlamingoEDSNeo3.ts": "041aa79e04b2fafb6da71178e7bcc7011f416c1d",
     "packages/bs-neo3/src/GhostMarketNDSNeo3.ts": "d7db2a624cf099fe550fa4a906f6127ca4815cac",
     "packages/bs-neo3/src/RpcBDSNeo3.ts": "11a7425844ab09a11c631281e103d1edeab4a63f",
-    "packages/bs-neo3/src/__tests__/BDSNeo3.spec.ts": "14bd204f3d4546c81b6ea37e16f3fe6e70102dd1",
-    "packages/bs-neo3/src/__tests__/BSNeo3.spec.ts": "edf56afc2efaa15d252eaaca0325cee364191699",
+    "packages/bs-neo3/src/__tests__/BDSNeo3.spec.ts": "ac5f20eac558af993c97a8d0d214e2865c916d44",
+    "packages/bs-neo3/src/__tests__/BSNeo3.spec.ts": "b1a3d7fca99e984f32bfe0b0a6aed3a25b5de375",
     "packages/bs-neo3/src/__tests__/DoraESNeo3.spec.ts": "450e087014c22b1a289e64dd80ff3e6ddfd8c932",
     "packages/bs-neo3/src/__tests__/FlamingoEDSNeo3.spec.ts": "473b1aafe03031a28a8414dfa681b06f843acdf6",
     "packages/bs-neo3/src/__tests__/GhostMarketNDSNeo3.spec.ts": "1d583380b60112fb99426b4bf140c92898177b1e",
@@ -21,9 +23,7 @@
     "packages/bs-neo3/src/index.ts": "bad314a9ba14b57075684c9b823a934863bac6b2",
     "packages/bs-neo3/tsconfig.build.json": "4dc23fb9c4c5e4d19a9bc3947a47c523f4bd967c",
     "packages/bs-neo3/tsconfig.json": "77cf2b789e9c665b62792f9992cc81ae86296ef7",
-    "packages/bs-neo3/.rush/temp/shrinkwrap-deps.json": "7348b8936da22d117d50dfb8445815a3fabc42cb",
-    "packages/bs-neo3/CHANGELOG.json": "4342936f2b30b621d5e4d5a5132fb78671f03c58",
-    "packages/bs-neo3/CHANGELOG.md": "0966cf0340002b2d3b964d6b1f88995bf0bf53bd"
+    "packages/bs-neo3/.rush/temp/shrinkwrap-deps.json": "7348b8936da22d117d50dfb8445815a3fabc42cb"
   },
   "arguments": "tsc --project tsconfig.build.json "
 }

package/CHANGELOG.json

@@ -2,9 +2,21 @@
   "name": "@cityofzion/bs-neo3",
   "entries": [
     {
-      "version": "0.8.0",
-      "tag": "@cityofzion/bs-neo3_v0.8.0",
-      "date": "Mon, 27 Nov 2023 22:13:46 GMT",
+      "version": "0.9.1",
+      "tag": "@cityofzion/bs-neo3_v0.9.1",
+      "date": "Wed, 06 Dec 2023 21:51:30 GMT",
+      "comments": {
+        "patch": [
+          {
+            "comment": "Prevent the getAllTransaction method from breaking when Dora returns data from v1"
+          }
+        ]
+      }
+    },
+    {
+      "version": "0.9.0",
+      "tag": "@cityofzion/bs-neo3_v0.9.0",
+      "date": "Tue, 05 Dec 2023 18:42:10 GMT",
       "comments": {
         "minor": [
           {
@@ -13,7 +25,7 @@
         ],
         "dependency": [
           {
-            "comment": "Updating dependency \"@cityofzion/blockchain-service\" to `0.8.0`"
+            "comment": "Updating dependency \"@cityofzion/blockchain-service\" to `0.9.0`"
           }
         ]
       }

package/CHANGELOG.md

@@ -1,9 +1,16 @@
 # Change Log - @cityofzion/bs-neo3
 
-This log was last generated on Mon, 27 Nov 2023 22:13:46 GMT and should not be manually modified.
+This log was last generated on Wed, 06 Dec 2023 21:51:30 GMT and should not be manually modified.
 
-## 0.8.0
-Mon, 27 Nov 2023 22:13:46 GMT
+## 0.9.1
+Wed, 06 Dec 2023 21:51:30 GMT
+
+### Patches
+
+- Prevent the getAllTransaction method from breaking when Dora returns data from v1
+
+## 0.9.0
+Tue, 05 Dec 2023 18:42:10 GMT
 
 ### Minor changes
 

package/dist/BSNeo3.d.ts

@@ -20,6 +20,7 @@ export declare class BSNeo3<BSCustomName extends string = string> implements Blo
     generateAccountFromMnemonic(mnemonic: string[] | string, index: number): AccountWithDerivationPath;
     generateAccountFromKey(key: string): Account;
     decrypt(encryptedKey: string, password: string): Promise<Account>;
+    encrypt(key: string, password: string): Promise<string>;
     calculateTransferFee(param: TransferParam): Promise<string>;
     transfer(param: TransferParam): Promise<string>;
     claim(account: Account): Promise<string>;

package/dist/BSNeo3.js

@@ -95,6 +95,9 @@ class BSNeo3 {
             return this.generateAccountFromKey(privateKey);
         });
     }
+    encrypt(key, password) {
+        return neon_js_1.wallet.encrypt(key, password);
+    }
     calculateTransferFee(param) {
         return __awaiter(this, void 0, void 0, function* () {
             const account = new neon_js_1.wallet.Account(param.senderAccount.key);

package/dist/DoraBDSNeo3.js

@@ -50,36 +50,42 @@ class DoraBDSNeo3 extends RpcBDSNeo3_1.RPCBDSNeo3 {
     getTransactionsByAddress({ address, page = 1, }) {
         return __awaiter(this, void 0, void 0, function* () {
             const data = yield NeoRest.addressTXFull(address, page, this.network.type);
-            const transactions = yield Promise.all(data.items.map((item) => __awaiter(this, void 0, void 0, function* () {
+            const promises = data.items.map((item) => __awaiter(this, void 0, void 0, function* () {
                 var _a, _b;
-                const filteredTransfers = item.notifications.filter(item => item.event_name === 'Transfer' && (item.state.value.length === 3 || item.state.value.length === 4));
-                const transferPromises = filteredTransfers.map(({ contract: contractHash, state: { value: properties } }) => __awaiter(this, void 0, void 0, function* () {
-                    var _c;
-                    const isAsset = properties.length === 3;
-                    const from = properties[0].value;
-                    const to = properties[1].value;
-                    const convertedFrom = from ? this.convertByteStringToAddress(from) : 'Mint';
-                    const convertedTo = to ? this.convertByteStringToAddress(to) : 'Burn';
-                    if (isAsset) {
-                        const token = yield this.getTokenInfo(contractHash);
-                        const [, , { value: amount }] = properties;
+                const transferPromises = [];
+                item.notifications.forEach(({ contract: contractHash, state, event_name: eventName }) => {
+                    const properties = Array.isArray(state) ? state : state.value;
+                    if (eventName !== 'Transfer' || (properties.length !== 3 && properties.length !== 4))
+                        return;
+                    const promise = () => __awaiter(this, void 0, void 0, function* () {
+                        var _a;
+                        const isAsset = properties.length === 3;
+                        const from = properties[0].value;
+                        const to = properties[1].value;
+                        const convertedFrom = from ? this.convertByteStringToAddress(from) : 'Mint';
+                        const convertedTo = to ? this.convertByteStringToAddress(to) : 'Burn';
+                        if (isAsset) {
+                            const token = yield this.getTokenInfo(contractHash);
+                            const [, , { value: amount }] = properties;
+                            return {
+                                amount: neon_js_1.u.BigInteger.fromNumber(amount).toDecimal((_a = token.decimals) !== null && _a !== void 0 ? _a : 0),
+                                from: convertedFrom,
+                                to: convertedTo,
+                                contractHash,
+                                type: 'token',
+                                token,
+                            };
+                        }
                         return {
-                            amount: neon_js_1.u.BigInteger.fromNumber(amount).toDecimal((_c = token.decimals) !== null && _c !== void 0 ? _c : 0),
                             from: convertedFrom,
                             to: convertedTo,
+                            tokenId: properties[3].value,
                             contractHash,
-                            type: 'token',
-                            token,
+                            type: 'nft',
                         };
-                    }
-                    return {
-                        from: convertedFrom,
-                        to: convertedTo,
-                        tokenId: properties[3].value,
-                        contractHash,
-                        type: 'nft',
-                    };
-                }));
+                    });
+                    transferPromises.push(promise());
+                });
                 const transfers = yield Promise.all(transferPromises);
                 const notifications = item.notifications.map(notification => ({
                     eventName: notification.event_name,
@@ -95,7 +101,8 @@ class DoraBDSNeo3 extends RpcBDSNeo3_1.RPCBDSNeo3 {
                     transfers,
                     notifications,
                 };
-            })));
+            }));
+            const transactions = yield Promise.all(promises);
             return {
                 totalCount: data.totalCount,
                 transactions,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cityofzion/bs-neo3",
-  "version": "0.8.0",
+  "version": "0.9.1",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "repository": "https://github.com/CityOfZion/blockchain-services",
@@ -16,7 +16,7 @@
     "@cityofzion/dora-ts": "0.0.11",
     "axios": "1.5.1",
     "query-string": "7.1.3",
-    "@cityofzion/blockchain-service": "0.8.0",
+    "@cityofzion/blockchain-service": "0.9.0",
     "@cityofzion/bs-asteroid-sdk": "0.7.3"
   },
   "devDependencies": {

package/src/BSNeo3.ts

@@ -130,6 +130,10 @@ export class BSNeo3<BSCustomName extends string = string>
     return this.generateAccountFromKey(privateKey)
   }
 
+  encrypt(key: string, password: string): Promise<string> {
+    return wallet.encrypt(key, password)
+  }
+
   async calculateTransferFee(param: TransferParam): Promise<string> {
     const account = new wallet.Account(param.senderAccount.key)
     const invoker = await NeonInvoker.init({

package/src/DoraBDSNeo3.ts

@@ -55,61 +55,67 @@ export class DoraBDSNeo3 extends RPCBDSNeo3 {
     page = 1,
   }: TransactionsByAddressParams): Promise<TransactionsByAddressResponse> {
     const data = await NeoRest.addressTXFull(address, page, this.network.type)
-    const transactions = await Promise.all(
-      data.items.map(async (item): Promise<TransactionResponse> => {
-        const filteredTransfers = item.notifications.filter(
-          item => item.event_name === 'Transfer' && (item.state.value.length === 3 || item.state.value.length === 4)
-        )
-        const transferPromises = filteredTransfers.map<Promise<TransactionTransferAsset | TransactionTransferNft>>(
-          async ({ contract: contractHash, state: { value: properties } }) => {
-            const isAsset = properties.length === 3
-
-            const from = properties[0].value
-            const to = properties[1].value
-            const convertedFrom = from ? this.convertByteStringToAddress(from) : 'Mint'
-            const convertedTo = to ? this.convertByteStringToAddress(to) : 'Burn'
-
-            if (isAsset) {
-              const token = await this.getTokenInfo(contractHash)
-              const [, , { value: amount }] = properties
-              return {
-                amount: u.BigInteger.fromNumber(amount).toDecimal(token.decimals ?? 0),
-                from: convertedFrom,
-                to: convertedTo,
-                contractHash,
-                type: 'token',
-                token,
-              }
-            }
 
+    const promises = data.items.map(async (item): Promise<TransactionResponse> => {
+      const transferPromises: Promise<TransactionTransferAsset | TransactionTransferNft>[] = []
+
+      item.notifications.forEach(({ contract: contractHash, state, event_name: eventName }) => {
+        const properties = Array.isArray(state) ? state : state.value
+        if (eventName !== 'Transfer' || (properties.length !== 3 && properties.length !== 4)) return
+
+        const promise = async (): Promise<TransactionTransferAsset | TransactionTransferNft> => {
+          const isAsset = properties.length === 3
+
+          const from = properties[0].value
+          const to = properties[1].value
+          const convertedFrom = from ? this.convertByteStringToAddress(from) : 'Mint'
+          const convertedTo = to ? this.convertByteStringToAddress(to) : 'Burn'
+
+          if (isAsset) {
+            const token = await this.getTokenInfo(contractHash)
+            const [, , { value: amount }] = properties
             return {
+              amount: u.BigInteger.fromNumber(amount).toDecimal(token.decimals ?? 0),
               from: convertedFrom,
               to: convertedTo,
-              tokenId: properties[3].value,
               contractHash,
-              type: 'nft',
+              type: 'token',
+              token,
             }
           }
-        )
-        const transfers = await Promise.all(transferPromises)
 
-        const notifications = item.notifications.map<TransactionNotifications>(notification => ({
-          eventName: notification.event_name,
-          state: notification.state as any,
-        }))
-
-        return {
-          block: item.block,
-          time: Number(item.time),
-          hash: item.hash,
-          fee: u.BigInteger.fromNumber(item.netfee ?? 0)
-            .add(u.BigInteger.fromNumber(item.sysfee ?? 0))
-            .toDecimal(this.feeToken.decimals),
-          transfers,
-          notifications,
+          return {
+            from: convertedFrom,
+            to: convertedTo,
+            tokenId: properties[3].value,
+            contractHash,
+            type: 'nft',
+          }
         }
+
+        transferPromises.push(promise())
       })
-    )
+
+      const transfers = await Promise.all(transferPromises)
+
+      const notifications = item.notifications.map<TransactionNotifications>(notification => ({
+        eventName: notification.event_name,
+        state: notification.state as any,
+      }))
+
+      return {
+        block: item.block,
+        time: Number(item.time),
+        hash: item.hash,
+        fee: u.BigInteger.fromNumber(item.netfee ?? 0)
+          .add(u.BigInteger.fromNumber(item.sysfee ?? 0))
+          .toDecimal(this.feeToken.decimals),
+        transfers,
+        notifications,
+      }
+    })
+
+    const transactions = await Promise.all(promises)
 
     return {
       totalCount: data.totalCount,

package/src/__tests__/BDSNeo3.spec.ts

@@ -27,43 +27,41 @@ describe('BDSNeo3', () => {
     }
   )
 
-  it.each([doraBDSNeo3, rpcBDSNeo3])(
+  it.each([doraBDSNeo3])(
     'Should be able to get transactions of address - %s',
     async (bdsNeo3: BlockchainDataService) => {
       const address = 'NNmTVFrSPhe7zjgN6iq9cLgXJwLZziUKV6'
-      try {
-        const response = await bdsNeo3.getTransactionsByAddress({ address, page: 1 })
+      const response = await bdsNeo3.getTransactionsByAddress({ address, page: 1 })
 
-        response.transactions.forEach(transaction => {
-          expect(transaction).toEqual(
-            expect.objectContaining({
-              block: expect.any(Number),
-              hash: expect.any(String),
-              notifications: expect.arrayContaining([
-                expect.objectContaining({
-                  eventName: expect.any(String),
-                  state: expect.arrayContaining([
-                    {
-                      type: expect.any(String),
-                      value: expect.any(String),
-                    },
-                  ]),
-                }),
-              ]),
-              transfers: expect.arrayContaining([
-                expect.objectContaining({
-                  amount: expect.any(String),
-                  from: expect.any(String),
-                  to: expect.any(String),
-                  type: 'asset',
-                }),
-              ]),
-              time: expect.any(Number),
-              fee: expect.any(String),
-            })
-          )
-        })
-      } catch {}
+      response.transactions.forEach(transaction => {
+        expect(transaction).toEqual(
+          expect.objectContaining({
+            block: expect.any(Number),
+            hash: expect.any(String),
+            time: expect.any(Number),
+            fee: expect.any(String),
+            notifications: expect.arrayContaining([
+              expect.objectContaining({
+                eventName: expect.any(String),
+                state: expect.arrayContaining([
+                  {
+                    type: expect.any(String),
+                    value: expect.any(String),
+                  },
+                ]),
+              }),
+            ]),
+            transfers: expect.arrayContaining([
+              expect.objectContaining({
+                amount: expect.any(String),
+                from: expect.any(String),
+                to: expect.any(String),
+                type: 'token',
+              }),
+            ]),
+          })
+        )
+      })
     }
   )
 

package/src/__tests__/BSNeo3.spec.ts

@@ -69,11 +69,19 @@ describe('BSNeo3', () => {
     const mnemonic = generateMnemonic()
     const account = bsNeo3.generateAccountFromMnemonic(mnemonic, 0)
     const password = 'TestPassword'
-    const encryptedKey = await wallet.encrypt(account.key, password)
+    const encryptedKey = await bsNeo3.encrypt(account.key, password)
     const decryptedAccount = await bsNeo3.decrypt(encryptedKey, password)
     expect(account).toEqual(expect.objectContaining(decryptedAccount))
   }, 20000)
 
+  it('Should be able to encrypt a key', async () => {
+    const mnemonic = generateMnemonic()
+    const account = bsNeo3.generateAccountFromMnemonic(mnemonic, 0)
+    const password = 'TestPassword'
+    const encryptedKey = await bsNeo3.encrypt(account.key, password)
+    expect(encryptedKey).toEqual(expect.any(String))
+  })
+
   it.skip('Should be able to calculate transfer fee', async () => {
     const account = bsNeo3.generateAccountFromKey(process.env.TESTNET_PRIVATE_KEY as string)