@cityofzion/bs-neo-legacy 1.10.8 → 1.10.10

package/dist/constants/BSNeoLegacyConstants.d.ts

@@ -24,4 +24,6 @@ export declare class BSNeoLegacyConstants {
     static readonly MIGRATION_MIN_GAS = 0.1;
     static readonly MIGRATION_MIN_NEO = 2;
     static readonly MIGRATION_COZ_NEO3_ADDRESS = "NLMsicDapULKFDmAzTsbhwrZjYZ83j53Ty";
+    static MAX_TRANSACTION_SIZE_WITHOUT_FEE: number;
+    static FEE_APPLIED_TO_PLAYABLE_TRANSACTION: number;
 }

package/dist/constants/BSNeoLegacyConstants.js

@@ -64,3 +64,5 @@ BSNeoLegacyConstants.MIGRATION_NEP_17_TRANSFER_FEE = 0.0112143;
 BSNeoLegacyConstants.MIGRATION_MIN_GAS = 0.1;
 BSNeoLegacyConstants.MIGRATION_MIN_NEO = 2;
 BSNeoLegacyConstants.MIGRATION_COZ_NEO3_ADDRESS = 'NLMsicDapULKFDmAzTsbhwrZjYZ83j53Ty';
+BSNeoLegacyConstants.MAX_TRANSACTION_SIZE_WITHOUT_FEE = 1024;
+BSNeoLegacyConstants.FEE_APPLIED_TO_PLAYABLE_TRANSACTION = 0.001;

package/dist/helpers/BSNeoLegacyHelper.js

@@ -36,7 +36,7 @@ class BSNeoLegacyHelper {
         return BSNeoLegacyConstants_1.BSNeoLegacyConstants.MAINNET_NETWORK_IDS.includes(network.id);
     }
     static normalizeHash(hash) {
-        return hash.startsWith('0x') ? hash.slice(2) : hash;
+        return (0, blockchain_service_1.normalizeHash)(hash, { lowercase: false });
     }
     static waitForMigration(params) {
         return __awaiter(this, void 0, void 0, function* () {

package/dist/services/BSNeoLegacy.d.ts

@@ -63,7 +63,7 @@ export declare class BSNeoLegacy<BSName extends string = string> implements Bloc
     decrypt(encryptedKey: string, password: string): Promise<Account<BSName>>;
     encrypt(key: string, password: string): Promise<string>;
     transfer({ intents, senderAccount, tipIntent, ...params }: TransferParam<BSName>): Promise<string[]>;
-    claim(account: Account): Promise<string>;
+    claim(account: Account<BSName>): Promise<string>;
     migrate({ account, neo3Address, neoLegacyMigrationAmounts }: MigrateParams<BSName>): Promise<string>;
     /**
      * Reference: https://github.com/CityOfZion/legacy-n3-swap-service/blob/master/policy/policy.go

package/dist/services/BSNeoLegacy.js

@@ -24,7 +24,7 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-var _BSNeoLegacy_instances, _BSNeoLegacy_generateSigningCallback, _BSNeoLegacy_setTokens;
+var _BSNeoLegacy_instances, _BSNeoLegacy_generateSigningCallback, _BSNeoLegacy_setTokens, _BSNeoLegacy_hasTransactionMoreThanMaxSize, _BSNeoLegacy_signTransfer, _BSNeoLegacy_sendTransfer, _BSNeoLegacy_signClaim, _BSNeoLegacy_sendClaim;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BSNeoLegacy = void 0;
 const blockchain_service_1 = require("@cityofzion/blockchain-service");
@@ -134,54 +134,27 @@ class BSNeoLegacy {
                         .toString()),
                 ]);
             }
-            let response;
-            if (nep5ScriptBuilder.isEmpty()) {
-                response = yield neon_js_1.api.sendAsset({
-                    account: neonJsAccount,
-                    api: apiProvider,
-                    url: this.network.url,
-                    intents: nativeIntents,
-                    fees: priorityFee,
-                    signingFunction: signingCallback,
-                });
-            }
-            else {
-                response = yield neon_js_1.api.doInvoke({
-                    intents: nativeIntents.length > 0 ? nativeIntents : undefined,
-                    account: neonJsAccount,
-                    api: apiProvider,
-                    script: nep5ScriptBuilder.str,
-                    url: this.network.url,
-                    fees: priorityFee,
-                    signingFunction: signingCallback,
-                });
-            }
-            if (!response.tx)
-                throw new Error('Failed to send transaction');
-            return intents.map(() => response.tx.hash);
+            const hash = yield __classPrivateFieldGet(this, _BSNeoLegacy_instances, "m", _BSNeoLegacy_sendTransfer).call(this, {
+                account: neonJsAccount,
+                api: apiProvider,
+                url: this.network.url,
+                intents: nativeIntents.length > 0 ? nativeIntents : undefined,
+                signingFunction: signingCallback,
+                fees: priorityFee,
+            }, nep5ScriptBuilder);
+            return intents.map(() => hash);
         });
     }
     claim(account) {
         return __awaiter(this, void 0, void 0, function* () {
-            const neoAccount = new neon_js_1.wallet.Account(account.key);
-            const balances = yield this.blockchainDataService.getBalance(account.address);
-            const neoBalance = balances.find(balance => balance.token.symbol === 'NEO');
-            if (!neoBalance)
-                throw new Error('It is necessary to have NEO to claim');
-            const unclaimed = yield this.blockchainDataService.getUnclaimed(account.address);
-            if (Number(unclaimed) <= 0)
-                throw new Error(`Doesn't have gas to claim`);
+            const { neonJsAccount, signingCallback } = yield __classPrivateFieldGet(this, _BSNeoLegacy_instances, "m", _BSNeoLegacy_generateSigningCallback).call(this, account);
             const apiProvider = new neon_js_1.api.neoCli.instance(this.legacyNetwork);
-            const claims = yield apiProvider.getClaims(account.address);
-            const response = yield neon_js_1.api.claimGas({
-                claims,
+            return yield __classPrivateFieldGet(this, _BSNeoLegacy_instances, "m", _BSNeoLegacy_sendClaim).call(this, {
                 api: apiProvider,
-                account: neoAccount,
+                account: neonJsAccount,
                 url: this.network.url,
+                signingFunction: signingCallback,
             });
-            if (!response.tx)
-                throw new Error('Failed to claim');
-            return response.tx.hash;
         });
     }
     migrate({ account, neo3Address, neoLegacyMigrationAmounts }) {
@@ -199,12 +172,11 @@ class BSNeoLegacy {
                 intents.push(...neon_js_1.api.makeIntent({ [this.GAS_ASSET.symbol]: Number(neoLegacyMigrationAmounts.gasBalance.amount) }, BSNeoLegacyConstants_1.BSNeoLegacyConstants.MIGRATION_COZ_LEGACY_ADDRESS));
             if (neoLegacyMigrationAmounts.neoBalance)
                 intents.push(...neon_js_1.api.makeIntent({ [this.NEO_ASSET.symbol]: Number(neoLegacyMigrationAmounts.neoBalance.amount) }, BSNeoLegacyConstants_1.BSNeoLegacyConstants.MIGRATION_COZ_LEGACY_ADDRESS));
-            const response = yield neon_js_1.api.sendAsset({
+            return yield __classPrivateFieldGet(this, _BSNeoLegacy_instances, "m", _BSNeoLegacy_sendTransfer).call(this, {
                 url: this.network.url,
                 api: provider,
                 account: neonJsAccount,
                 intents,
-                fees: 0,
                 signingFunction: signingCallback,
                 override: {
                     attributes: [
@@ -219,9 +191,6 @@ class BSNeoLegacy {
                     ],
                 },
             });
-            if (!response.tx)
-                throw new Error('Migration failed on send');
-            return response.tx.hash;
         });
     }
     /**
@@ -292,6 +261,7 @@ _BSNeoLegacy_instances = new WeakSet(), _BSNeoLegacy_generateSigningCallback = f
         }
         return {
             neonJsAccount,
+            signingCallback: neon_js_1.api.signWithPrivateKey(neonJsAccount.privateKey),
         };
     });
 }, _BSNeoLegacy_setTokens = function _BSNeoLegacy_setTokens(network) {
@@ -301,4 +271,56 @@ _BSNeoLegacy_instances = new WeakSet(), _BSNeoLegacy_generateSigningCallback = f
     this.feeToken = tokens.find(token => token.symbol === 'GAS');
     this.burnToken = tokens.find(token => token.symbol === 'NEO');
     this.claimToken = tokens.find(token => token.symbol === 'GAS');
+}, _BSNeoLegacy_hasTransactionMoreThanMaxSize = function _BSNeoLegacy_hasTransactionMoreThanMaxSize(config) {
+    if (!config.fees || config.fees < BSNeoLegacyConstants_1.BSNeoLegacyConstants.FEE_APPLIED_TO_PLAYABLE_TRANSACTION) {
+        const serializedTransaction = config.tx.serialize(true);
+        const transactionSize = serializedTransaction.length / 2;
+        if (transactionSize > BSNeoLegacyConstants_1.BSNeoLegacyConstants.MAX_TRANSACTION_SIZE_WITHOUT_FEE) {
+            return true;
+        }
+    }
+    return false;
+}, _BSNeoLegacy_signTransfer = function _BSNeoLegacy_signTransfer(config, nep5ScriptBuilder) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (!nep5ScriptBuilder || nep5ScriptBuilder.isEmpty()) {
+            config = yield neon_js_1.api.createContractTx(config);
+        }
+        else {
+            config.script = nep5ScriptBuilder.str;
+            config = yield neon_js_1.api.createInvocationTx(config);
+        }
+        config = yield neon_js_1.api.modifyTransactionForEmptyTransaction(config);
+        config = yield neon_js_1.api.addAttributeIfExecutingAsSmartContract(config);
+        config = yield neon_js_1.api.signTx(config);
+        config = yield neon_js_1.api.addSignatureIfExecutingAsSmartContract(config);
+        return config;
+    });
+}, _BSNeoLegacy_sendTransfer = function _BSNeoLegacy_sendTransfer(config, nep5ScriptBuilder) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const sharedConfig = yield neon_js_1.api.fillBalance(config);
+        let signedConfig = yield __classPrivateFieldGet(this, _BSNeoLegacy_instances, "m", _BSNeoLegacy_signTransfer).call(this, Object.assign({}, sharedConfig), nep5ScriptBuilder);
+        if (__classPrivateFieldGet(this, _BSNeoLegacy_instances, "m", _BSNeoLegacy_hasTransactionMoreThanMaxSize).call(this, signedConfig)) {
+            signedConfig = yield __classPrivateFieldGet(this, _BSNeoLegacy_instances, "m", _BSNeoLegacy_signTransfer).call(this, Object.assign(Object.assign({}, sharedConfig), { fees: BSNeoLegacyConstants_1.BSNeoLegacyConstants.FEE_APPLIED_TO_PLAYABLE_TRANSACTION }), nep5ScriptBuilder);
+        }
+        signedConfig = yield neon_js_1.api.sendTx(signedConfig);
+        return signedConfig.response.txid;
+    });
+}, _BSNeoLegacy_signClaim = function _BSNeoLegacy_signClaim(config) {
+    return __awaiter(this, void 0, void 0, function* () {
+        config = yield neon_js_1.api.createClaimTx(config);
+        config = yield neon_js_1.api.addAttributeIfExecutingAsSmartContract(config);
+        config = yield neon_js_1.api.signTx(config);
+        config = yield neon_js_1.api.addSignatureIfExecutingAsSmartContract(config);
+        return config;
+    });
+}, _BSNeoLegacy_sendClaim = function _BSNeoLegacy_sendClaim(config) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const sharedConfig = yield neon_js_1.api.fillClaims(config);
+        let signedConfig = yield __classPrivateFieldGet(this, _BSNeoLegacy_instances, "m", _BSNeoLegacy_signClaim).call(this, Object.assign({}, sharedConfig));
+        if (__classPrivateFieldGet(this, _BSNeoLegacy_instances, "m", _BSNeoLegacy_hasTransactionMoreThanMaxSize).call(this, signedConfig)) {
+            signedConfig = yield __classPrivateFieldGet(this, _BSNeoLegacy_instances, "m", _BSNeoLegacy_signClaim).call(this, Object.assign(Object.assign({}, sharedConfig), { fees: BSNeoLegacyConstants_1.BSNeoLegacyConstants.FEE_APPLIED_TO_PLAYABLE_TRANSACTION }));
+        }
+        signedConfig = yield neon_js_1.api.sendTx(signedConfig);
+        return signedConfig.response.txid;
+    });
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cityofzion/bs-neo-legacy",
-  "version": "1.10.8",
+  "version": "1.10.10",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "author": "Coz",
@@ -12,7 +12,7 @@
     "@cityofzion/dora-ts": "0.0.11",
     "@cityofzion/neon-js": "4.8.3",
     "@ledgerhq/hw-transport": "~6.30.5",
-    "@cityofzion/blockchain-service": "1.16.3",
+    "@cityofzion/blockchain-service": "1.17.0",
     "@cityofzion/bs-asteroid-sdk": "0.9.1"
   },
   "devDependencies": {