@across-protocol/sdk 4.3.103 → 4.3.105
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/arch/svm/eventsClient.js +9 -11
- package/dist/cjs/arch/svm/eventsClient.js.map +1 -1
- package/dist/esm/arch/svm/eventsClient.js +10 -12
- package/dist/esm/arch/svm/eventsClient.js.map +1 -1
- package/dist/types/arch/svm/eventsClient.d.ts.map +1 -1
- package/package.json +2 -2
- package/src/arch/svm/eventsClient.ts +3 -4
|
@@ -144,26 +144,24 @@ var SvmCpiEventsClient = (function () {
|
|
|
144
144
|
.send()];
|
|
145
145
|
case 1:
|
|
146
146
|
txResult = _a.sent();
|
|
147
|
-
if (txResult === null)
|
|
148
|
-
return [2, []];
|
|
149
147
|
return [2, this.processEventFromTx(txResult)];
|
|
150
148
|
}
|
|
151
149
|
});
|
|
152
150
|
});
|
|
153
151
|
};
|
|
154
152
|
SvmCpiEventsClient.prototype.processEventFromTx = function (txResult) {
|
|
155
|
-
var _a, _b, _c, _d, _e, _f, _g, _h;
|
|
156
|
-
if (!txResult)
|
|
153
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j;
|
|
154
|
+
if (!(0, utils_1.isDefined)(txResult) || (0, utils_1.isDefined)((_a = txResult.meta) === null || _a === void 0 ? void 0 : _a.err))
|
|
157
155
|
return [];
|
|
158
156
|
var events = [];
|
|
159
157
|
var accountKeys = txResult.transaction.message.accountKeys;
|
|
160
158
|
var messageAccountKeys = tslib_1.__spreadArray([], accountKeys, true);
|
|
161
|
-
messageAccountKeys.push.apply(messageAccountKeys, ((
|
|
162
|
-
messageAccountKeys.push.apply(messageAccountKeys, ((
|
|
163
|
-
for (var _i = 0,
|
|
164
|
-
var ixBlock =
|
|
165
|
-
for (var
|
|
166
|
-
var ix = _l
|
|
159
|
+
messageAccountKeys.push.apply(messageAccountKeys, ((_d = (_c = (_b = txResult === null || txResult === void 0 ? void 0 : txResult.meta) === null || _b === void 0 ? void 0 : _b.loadedAddresses) === null || _c === void 0 ? void 0 : _c.writable) !== null && _d !== void 0 ? _d : []));
|
|
160
|
+
messageAccountKeys.push.apply(messageAccountKeys, ((_g = (_f = (_e = txResult === null || txResult === void 0 ? void 0 : txResult.meta) === null || _e === void 0 ? void 0 : _e.loadedAddresses) === null || _f === void 0 ? void 0 : _f.readonly) !== null && _g !== void 0 ? _g : []));
|
|
161
|
+
for (var _i = 0, _k = (_j = (_h = txResult.meta) === null || _h === void 0 ? void 0 : _h.innerInstructions) !== null && _j !== void 0 ? _j : []; _i < _k.length; _i++) {
|
|
162
|
+
var ixBlock = _k[_i];
|
|
163
|
+
for (var _l = 0, _m = ixBlock.instructions; _l < _m.length; _l++) {
|
|
164
|
+
var ix = _m[_l];
|
|
167
165
|
var ixProgramId = messageAccountKeys[ix.programIdIndex];
|
|
168
166
|
var singleIxAccount = ix.accounts.length === 1 ? messageAccountKeys[ix.accounts[0]] : undefined;
|
|
169
167
|
if (ixProgramId !== undefined &&
|
|
@@ -172,7 +170,7 @@ var SvmCpiEventsClient = (function () {
|
|
|
172
170
|
this.programEventAuthority === singleIxAccount) {
|
|
173
171
|
var ixData = utils_1.bs58.decode(ix.data);
|
|
174
172
|
var eventData = Buffer.from(ixData.slice(8)).toString("base64");
|
|
175
|
-
var
|
|
173
|
+
var _o = (0, utils_2.decodeEvent)(this.idl, eventData), name_1 = _o.name, data = _o.data;
|
|
176
174
|
events.push({ program: this.programAddress, name: name_1, data: data });
|
|
177
175
|
}
|
|
178
176
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eventsClient.js","sourceRoot":"","sources":["../../../../src/arch/svm/eventsClient.ts"],"names":[],"mappings":";;;;AACA,wDAA6E;AAC7E,2EAAmF;AACnF,mCAQqB;AACrB,
|
|
1
|
+
{"version":3,"file":"eventsClient.js","sourceRoot":"","sources":["../../../../src/arch/svm/eventsClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import { __assign, __awaiter, __generator, __spreadArray } from "tslib";
|
|
|
2
2
|
import { getDeployedAddress, SvmSpokeIdl } from "@across-protocol/contracts";
|
|
3
3
|
import { getSolanaChainId } from "@across-protocol/contracts/dist/src/svm/web3-v1";
|
|
4
4
|
import { address, getProgramDerivedAddress, } from "@solana/kit";
|
|
5
|
-
import { bs58, chainIsSvm, getMessageHash, toAddressType } from "../../utils";
|
|
5
|
+
import { bs58, chainIsSvm, getMessageHash, isDefined, toAddressType } from "../../utils";
|
|
6
6
|
import { decodeEvent, isDevnet } from "./utils";
|
|
7
7
|
import { unwrapEventData } from "./";
|
|
8
8
|
import assert from "assert";
|
|
@@ -183,8 +183,6 @@ var SvmCpiEventsClient = /** @class */ (function () {
|
|
|
183
183
|
.send()];
|
|
184
184
|
case 1:
|
|
185
185
|
txResult = _a.sent();
|
|
186
|
-
if (txResult === null)
|
|
187
|
-
return [2 /*return*/, []];
|
|
188
186
|
return [2 /*return*/, this.processEventFromTx(txResult)];
|
|
189
187
|
}
|
|
190
188
|
});
|
|
@@ -197,20 +195,20 @@ var SvmCpiEventsClient = /** @class */ (function () {
|
|
|
197
195
|
* @returns A promise that resolves to an array of events with their data and name.
|
|
198
196
|
*/
|
|
199
197
|
SvmCpiEventsClient.prototype.processEventFromTx = function (txResult) {
|
|
200
|
-
var _a, _b, _c, _d, _e, _f, _g, _h;
|
|
201
|
-
if (!txResult)
|
|
198
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j;
|
|
199
|
+
if (!isDefined(txResult) || isDefined((_a = txResult.meta) === null || _a === void 0 ? void 0 : _a.err))
|
|
202
200
|
return [];
|
|
203
201
|
var events = [];
|
|
204
202
|
var accountKeys = txResult.transaction.message.accountKeys;
|
|
205
203
|
var messageAccountKeys = __spreadArray([], accountKeys, true);
|
|
206
204
|
// Writable accounts come first, then readonly.
|
|
207
205
|
// See https://docs.anza.xyz/proposals/versioned-transactions#new-transaction-format
|
|
208
|
-
messageAccountKeys.push.apply(messageAccountKeys, ((
|
|
209
|
-
messageAccountKeys.push.apply(messageAccountKeys, ((
|
|
210
|
-
for (var _i = 0,
|
|
211
|
-
var ixBlock =
|
|
212
|
-
for (var
|
|
213
|
-
var ix = _l
|
|
206
|
+
messageAccountKeys.push.apply(messageAccountKeys, ((_d = (_c = (_b = txResult === null || txResult === void 0 ? void 0 : txResult.meta) === null || _b === void 0 ? void 0 : _b.loadedAddresses) === null || _c === void 0 ? void 0 : _c.writable) !== null && _d !== void 0 ? _d : []));
|
|
207
|
+
messageAccountKeys.push.apply(messageAccountKeys, ((_g = (_f = (_e = txResult === null || txResult === void 0 ? void 0 : txResult.meta) === null || _e === void 0 ? void 0 : _e.loadedAddresses) === null || _f === void 0 ? void 0 : _f.readonly) !== null && _g !== void 0 ? _g : []));
|
|
208
|
+
for (var _i = 0, _k = (_j = (_h = txResult.meta) === null || _h === void 0 ? void 0 : _h.innerInstructions) !== null && _j !== void 0 ? _j : []; _i < _k.length; _i++) {
|
|
209
|
+
var ixBlock = _k[_i];
|
|
210
|
+
for (var _l = 0, _m = ixBlock.instructions; _l < _m.length; _l++) {
|
|
211
|
+
var ix = _m[_l];
|
|
214
212
|
var ixProgramId = messageAccountKeys[ix.programIdIndex];
|
|
215
213
|
var singleIxAccount = ix.accounts.length === 1 ? messageAccountKeys[ix.accounts[0]] : undefined;
|
|
216
214
|
if (ixProgramId !== undefined &&
|
|
@@ -220,7 +218,7 @@ var SvmCpiEventsClient = /** @class */ (function () {
|
|
|
220
218
|
var ixData = bs58.decode(ix.data);
|
|
221
219
|
// Skip the first 8 bytes (assumed header) and encode the rest.
|
|
222
220
|
var eventData = Buffer.from(ixData.slice(8)).toString("base64");
|
|
223
|
-
var
|
|
221
|
+
var _o = decodeEvent(this.idl, eventData), name_1 = _o.name, data = _o.data;
|
|
224
222
|
events.push({ program: this.programAddress, name: name_1, data: data });
|
|
225
223
|
}
|
|
226
224
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eventsClient.js","sourceRoot":"","sources":["../../../../src/arch/svm/eventsClient.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC7E,OAAO,EAAE,gBAAgB,EAAE,MAAM,iDAAiD,CAAC;AACnF,OAAO,EACL,OAAO,EAGP,wBAAwB,GAIzB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"eventsClient.js","sourceRoot":"","sources":["../../../../src/arch/svm/eventsClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eventsClient.d.ts","sourceRoot":"","sources":["../../../../src/arch/svm/eventsClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAGxC,OAAO,EAEL,OAAO,EACP,UAAU,EAEV,0BAA0B,EAE1B,SAAS,EACV,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAEhE,OAAO,EAAW,eAAe,EAAQ,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAahF,KAAK,6BAA6B,GAAG,UAAU,CAAC,0BAA0B,CAAC,yBAAyB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAI1G,MAAM,MAAM,yBAAyB,GAAG,IAAI,CAAC,eAAe,EAAE,eAAe,GAAG,aAAa,CAAC,CAAC;AAC/F,MAAM,MAAM,sBAAsB,GAAG,YAAY,CAAC;AAElD,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,GAAG,CAAc;IACzB,OAAO,CAAC,cAAc,CAAU;IAChC,OAAO,CAAC,qBAAqB,CAAU;IACvC,OAAO,CAAC,GAAG,CAAM;IAEjB;;OAEG;gBACS,GAAG,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG;IAOjF;;OAEG;WACiB,MAAM,CAAC,GAAG,EAAE,WAAW,GAAG,OAAO,CAAC,kBAAkB,CAAC;WAOrD,SAAS,CAAC,GAAG,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,kBAAkB,CAAC;IASzG;;;;;;;;OAQG;IACU,WAAW,CACtB,SAAS,EAAE,SAAS,EACpB,QAAQ,CAAC,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,MAAM,EACf,OAAO,GAAE,6BAAwE,GAChF,OAAO,CAAC,aAAa,EAAE,CAAC;IAK3B;;;;;;;;OAQG;IACU,yBAAyB,CACpC,SAAS,EAAE,MAAM,EACjB,cAAc,EAAE,OAAO,EACvB,QAAQ,CAAC,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,MAAM,EACf,OAAO,GAAE,6BAAwE,GAChF,OAAO,CAAC,aAAa,EAAE,CAAC;IAK3B;;;;;;;;OAQG;YACW,cAAc;IAsD5B;;;;;;OAMG;IACG,uBAAuB,CAAC,WAAW,EAAE,SAAS,EAAE,UAAU,GAAE,UAAwB;
|
|
1
|
+
{"version":3,"file":"eventsClient.d.ts","sourceRoot":"","sources":["../../../../src/arch/svm/eventsClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAGxC,OAAO,EAEL,OAAO,EACP,UAAU,EAEV,0BAA0B,EAE1B,SAAS,EACV,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAEhE,OAAO,EAAW,eAAe,EAAQ,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAahF,KAAK,6BAA6B,GAAG,UAAU,CAAC,0BAA0B,CAAC,yBAAyB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAI1G,MAAM,MAAM,yBAAyB,GAAG,IAAI,CAAC,eAAe,EAAE,eAAe,GAAG,aAAa,CAAC,CAAC;AAC/F,MAAM,MAAM,sBAAsB,GAAG,YAAY,CAAC;AAElD,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,GAAG,CAAc;IACzB,OAAO,CAAC,cAAc,CAAU;IAChC,OAAO,CAAC,qBAAqB,CAAU;IACvC,OAAO,CAAC,GAAG,CAAM;IAEjB;;OAEG;gBACS,GAAG,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG;IAOjF;;OAEG;WACiB,MAAM,CAAC,GAAG,EAAE,WAAW,GAAG,OAAO,CAAC,kBAAkB,CAAC;WAOrD,SAAS,CAAC,GAAG,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,kBAAkB,CAAC;IASzG;;;;;;;;OAQG;IACU,WAAW,CACtB,SAAS,EAAE,SAAS,EACpB,QAAQ,CAAC,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,MAAM,EACf,OAAO,GAAE,6BAAwE,GAChF,OAAO,CAAC,aAAa,EAAE,CAAC;IAK3B;;;;;;;;OAQG;IACU,yBAAyB,CACpC,SAAS,EAAE,MAAM,EACjB,cAAc,EAAE,OAAO,EACvB,QAAQ,CAAC,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,MAAM,EACf,OAAO,GAAE,6BAAwE,GAChF,OAAO,CAAC,aAAa,EAAE,CAAC;IAK3B;;;;;;;;OAQG;YACW,cAAc;IAsD5B;;;;;;OAMG;IACG,uBAAuB,CAAC,WAAW,EAAE,SAAS,EAAE,UAAU,GAAE,UAAwB;iBAcd,OAAO;cAAQ,OAAO;cAAQ,MAAM;;IANhH;;;;;OAKG;IACH,OAAO,CAAC,kBAAkB;IAiC1B;;;;;;;OAOG;IACU,6BAA6B,CACxC,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,SAAS,EACtB,UAAU,GAAE,UAAwB,GACnC,OAAO,CAAC,yBAAyB,EAAE,GAAG,SAAS,CAAC;IAsDnD;;;;;;OAMG;IACU,0BAA0B,CACrC,kBAAkB,EAAE,MAAM,EAC1B,WAAW,EAAE,SAAS,EACtB,UAAU,GAAE,UAAwB,GACnC,OAAO,CAAC,sBAAsB,EAAE,GAAG,SAAS,CAAC;IAuDzC,iBAAiB,IAAI,OAAO;IAI5B,MAAM,IAAI,WAAW;CAG7B"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@across-protocol/sdk",
|
|
3
3
|
"author": "UMA Team",
|
|
4
|
-
"version": "4.3.
|
|
4
|
+
"version": "4.3.105",
|
|
5
5
|
"license": "AGPL-3.0",
|
|
6
6
|
"homepage": "https://docs.across.to/reference/sdk",
|
|
7
7
|
"repository": {
|
|
@@ -110,7 +110,7 @@
|
|
|
110
110
|
},
|
|
111
111
|
"dependencies": {
|
|
112
112
|
"@across-protocol/across-token": "^1.0.0",
|
|
113
|
-
"@across-protocol/constants": "^3.1.
|
|
113
|
+
"@across-protocol/constants": "^3.1.94",
|
|
114
114
|
"@across-protocol/contracts": "^4.1.14",
|
|
115
115
|
"@coral-xyz/anchor": "^0.30.1",
|
|
116
116
|
"@eth-optimism/sdk": "^3.3.1",
|
|
@@ -10,7 +10,7 @@ import {
|
|
|
10
10
|
GetTransactionApi,
|
|
11
11
|
Signature,
|
|
12
12
|
} from "@solana/kit";
|
|
13
|
-
import { bs58, chainIsSvm, getMessageHash, toAddressType } from "../../utils";
|
|
13
|
+
import { bs58, chainIsSvm, getMessageHash, isDefined, toAddressType } from "../../utils";
|
|
14
14
|
import { EventName, EventWithData, SVMProvider } from "./types";
|
|
15
15
|
import { decodeEvent, isDevnet } from "./utils";
|
|
16
16
|
import { Deposit, DepositWithTime, Fill, FillWithTime } from "../../interfaces";
|
|
@@ -182,7 +182,6 @@ export class SvmCpiEventsClient {
|
|
|
182
182
|
.getTransaction(txSignature, { commitment, maxSupportedTransactionVersion: 0 })
|
|
183
183
|
.send();
|
|
184
184
|
|
|
185
|
-
if (txResult === null) return [];
|
|
186
185
|
return this.processEventFromTx(txResult);
|
|
187
186
|
}
|
|
188
187
|
|
|
@@ -192,8 +191,8 @@ export class SvmCpiEventsClient {
|
|
|
192
191
|
* @param txResult - The transaction result.
|
|
193
192
|
* @returns A promise that resolves to an array of events with their data and name.
|
|
194
193
|
*/
|
|
195
|
-
private processEventFromTx(txResult
|
|
196
|
-
if (!txResult) return [];
|
|
194
|
+
private processEventFromTx(txResult?: GetTransactionReturnType): { program: Address; data: unknown; name: string }[] {
|
|
195
|
+
if (!isDefined(txResult) || isDefined(txResult.meta?.err)) return [];
|
|
197
196
|
const events: { program: Address; data: unknown; name: string }[] = [];
|
|
198
197
|
|
|
199
198
|
const accountKeys = txResult.transaction.message.accountKeys;
|