@deriverse/kit 1.0.18 → 1.0.20

package/dist/index.js

@@ -262,6 +262,9 @@ class Engine {
         let crncyTokenDec = 1;
         let logs = [];
         for (var log of data) {
+            if (log.startsWith("Program returned error")) {
+                return [];
+            }
             if (!log.startsWith("Program data: ")) {
                 continue;
             }
@@ -642,7 +645,7 @@ class Engine {
                     commitment: this.commitment,
                     encoding: 'base64'
                 }).send();
-                if (infos == null) {
+                if (infos.value == null) {
                     throw new Error("Initialization failed: getMultipleAccountsInfo");
                 }
                 this.rootStateModel = structure_models_1.RootStateModel.fromBuffer(infos.value[0].data);
@@ -682,7 +685,7 @@ class Engine {
     addToken(tokenAccount) {
         return __awaiter(this, void 0, void 0, function* () {
             const info = yield this.rpc.getAccountInfo(tokenAccount, { commitment: this.commitment, encoding: 'base64' }).send();
-            if (info == null) {
+            if (info.value == null) {
                 throw new Error("Add Token Failed: getAccountInfo");
             }
             const tokenStateModel = structure_models_1.TokenStateModel.fromBuffer(info.value.data);
@@ -697,7 +700,7 @@ class Engine {
     addInstr(instrAccount) {
         return __awaiter(this, void 0, void 0, function* () {
             const info = yield this.rpc.getAccountInfo(instrAccount, { commitment: this.commitment, encoding: 'base64' }).send();
-            if (info == null) {
+            if (info.value == null) {
                 throw new Error("Add Instrument Failed: getAccountInfo");
             }
             const instrAccountHeaderModel = structure_models_1.InstrAccountHeaderModel.fromBuffer(info.value.data);
@@ -736,7 +739,7 @@ class Engine {
     updateCommunity() {
         return __awaiter(this, void 0, void 0, function* () {
             const info = yield this.rpc.getAccountInfo(this.communityAccount, { commitment: this.commitment, encoding: 'base64' }).send();
-            if (info == null) {
+            if (info.value == null) {
                 throw new Error("Community Account: GetAccountInfo Failed");
             }
             this.updateCommunityFromBuffer(info.value.data);
@@ -748,7 +751,7 @@ class Engine {
     updateRoot() {
         return __awaiter(this, void 0, void 0, function* () {
             const info = yield this.rpc.getAccountInfo(this.rootAccount, { commitment: this.commitment, encoding: 'base64' }).send();
-            if (info == null) {
+            if (info.value == null) {
                 throw new Error("Root Account: GetAccountInfo Failed");
             }
             this.updateRootFromBuffer(info.value.data);
@@ -1077,7 +1080,7 @@ class Engine {
                 tag: types_1.AccountType.INSTR
             });
             let info = yield this.rpc.getAccountInfo(instrAddress, { commitment: this.commitment, encoding: 'base64', dataSlice: { offset: structure_models_1.InstrAccountHeaderModel.OFFSET_ID, length: 4 } }).send();
-            if (info == null) {
+            if (info.value == null) {
                 return null;
             }
             else {
@@ -1187,7 +1190,7 @@ class Engine {
                     commitment: this.commitment,
                     encoding: 'base64'
                 }).send();
-                if (info == null) {
+                if (info.value == null) {
                     return false;
                 }
                 const clientPrimaryAccountHeaderModel = structure_models_1.ClientPrimaryAccountHeaderModel.fromBuffer(info.value.data);
@@ -1215,7 +1218,7 @@ class Engine {
                 commitment: this.commitment,
                 encoding: 'base64'
             }).send();
-            if (infos == null) {
+            if (infos.value == null) {
                 throw new Error("GetClientData: GetAccountInfo failed");
             }
             const clientPrimaryAccountHeaderModel = structure_models_1.ClientPrimaryAccountHeaderModel.fromBuffer(infos.value[0].data);
@@ -2548,8 +2551,8 @@ class Engine {
             const tokenProgramId = assetInfo.value.owner == TOKEN_2022_PROGRAM_ID ? TOKEN_2022_PROGRAM_ID : TOKEN_PROGRAM_ID;
             const crncyTokenId = yield this.getTokenId(args.crncyMint);
             const id = yield this.getTokenId(args.assetMint);
-            const newAssetTokenId = id == null;
-            const assetTokenId = newAssetTokenId ? this.rootStateModel.tokensCount : id;
+            const newAssetToken = id == null;
+            const assetTokenId = newAssetToken ? this.rootStateModel.tokensCount : id;
             if (!crncyTokenId) {
                 throw new Error("Currency mint not found");
             }
@@ -2579,11 +2582,12 @@ class Engine {
             let keys = [
                 { address: this.signer, role: kit_1.AccountRole.READONLY_SIGNER },
                 { address: this.rootAccount, role: kit_1.AccountRole.WRITABLE },
-                { address: yield this.getTokenAccount(args.assetMint), role: newAssetTokenId ? kit_1.AccountRole.WRITABLE : kit_1.AccountRole.READONLY },
+                { address: yield this.getTokenAccount(args.assetMint), role: newAssetToken ? kit_1.AccountRole.WRITABLE : kit_1.AccountRole.READONLY },
                 { address: yield this.getTokenAccount(args.crncyMint), role: kit_1.AccountRole.READONLY },
-                { address: newAssetTokenId ? args.newProgramAccountAddress : this.tokens.get(assetTokenId).programAddress, role: newAssetTokenId ? kit_1.AccountRole.WRITABLE_SIGNER : kit_1.AccountRole.READONLY },
+                { address: newAssetToken ? args.newProgramAccountAddress : this.tokens.get(assetTokenId).programAddress, role: newAssetToken ? kit_1.AccountRole.WRITABLE_SIGNER : kit_1.AccountRole.READONLY },
                 { address: args.assetMint, role: kit_1.AccountRole.READONLY },
                 { address: lutAddress, role: kit_1.AccountRole.WRITABLE },
+                { address: SYSTEM_PROGRAM_ID, role: kit_1.AccountRole.READONLY },
                 { address: tokenProgramId, role: kit_1.AccountRole.READONLY },
                 { address: ADDRESS_LOOKUP_TABLE_PROGRAM_ID, role: kit_1.AccountRole.READONLY },
                 { address: this.drvsAuthority, role: kit_1.AccountRole.READONLY },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deriverse/kit",
-  "version": "1.0.18",
+  "version": "1.0.20",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",