@wormhole-foundation/sdk-aptos-cctp 3.4.5 → 3.4.6
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/circleBridge.d.ts +4 -4
- package/dist/cjs/circleBridge.d.ts.map +1 -1
- package/dist/cjs/circleBridge.js +29 -4
- package/dist/cjs/circleBridge.js.map +1 -1
- package/dist/esm/circleBridge.d.ts +4 -4
- package/dist/esm/circleBridge.d.ts.map +1 -1
- package/dist/esm/circleBridge.js +30 -5
- package/dist/esm/circleBridge.js.map +1 -1
- package/package.json +3 -3
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { Aptos } from "@aptos-labs/ts-sdk";
|
|
1
|
+
import type { Aptos } from "@aptos-labs/ts-sdk";
|
|
2
2
|
import { AptosUnsignedTransaction, type AptosChains } from "@wormhole-foundation/sdk-aptos";
|
|
3
|
-
import type { AccountAddress, ChainAddress, ChainsConfig, Network, Platform } from "@wormhole-foundation/sdk-connect";
|
|
4
|
-
import { CircleBridge
|
|
5
|
-
import { AptosCCTPMoveScripts } from "./moveScripts.js";
|
|
3
|
+
import type { AccountAddress, ChainAddress, ChainsConfig, Network, Platform, CircleTransferMessage, Contracts } from "@wormhole-foundation/sdk-connect";
|
|
4
|
+
import { CircleBridge } from "@wormhole-foundation/sdk-connect";
|
|
5
|
+
import type { AptosCCTPMoveScripts } from "./moveScripts.js";
|
|
6
6
|
export declare class AptosCircleBridge<N extends Network, C extends AptosChains> implements CircleBridge<N, C> {
|
|
7
7
|
readonly network: N;
|
|
8
8
|
readonly chain: C;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"circleBridge.d.ts","sourceRoot":"","sources":["../../src/circleBridge.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"circleBridge.d.ts","sourceRoot":"","sources":["../../src/circleBridge.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,KAAK,EAGmB,MAAM,oBAAoB,CAAC;AAOrD,OAAO,EAEL,wBAAwB,EACxB,KAAK,WAAW,EACjB,MAAM,gCAAgC,CAAC;AACxC,OAAO,KAAK,EACV,cAAc,EACd,YAAY,EACZ,YAAY,EACZ,OAAO,EACP,QAAQ,EAER,qBAAqB,EACrB,SAAS,EAAC,MAAM,kCAAkC,CAAC;AACrD,OAAO,EACL,YAAY,EAIb,MAAM,kCAAkC,CAAC;AAC1C,OAAO,KAAK,EAAE,oBAAoB,EAAC,MAAM,kBAAkB,CAAC;AAG5D,qBAAa,iBAAiB,CAAC,CAAC,SAAS,OAAO,EAAE,CAAC,SAAS,WAAW,CACrE,YAAW,YAAY,CAAC,CAAC,EAAE,CAAC,CAAC;IAQ3B,QAAQ,CAAC,OAAO,EAAE,CAAC;IACnB,QAAQ,CAAC,KAAK,EAAE,CAAC;IACjB,QAAQ,CAAC,QAAQ,EAAE,KAAK;IACxB,QAAQ,CAAC,SAAS,EAAE,SAAS;IAT/B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,oBAAoB,EAAE,MAAM,CAAC;IACtC,QAAQ,CAAC,WAAW,EAAE,oBAAoB,CAAC;gBAGhC,OAAO,EAAE,CAAC,EACV,KAAK,EAAE,CAAC,EACR,QAAQ,EAAE,KAAK,EACf,SAAS,EAAE,SAAS;IAyBxB,QAAQ,CACb,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC,EACzB,SAAS,EAAE,YAAY,EACvB,MAAM,EAAE,MAAM,GACb,cAAc,CAAC,wBAAwB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAiB3C,mBAAmB,CAAC,OAAO,EAAE,YAAY,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAgBnE,MAAM,CACX,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC,EACzB,OAAO,EAAE,YAAY,CAAC,OAAO,EAC7B,WAAW,EAAE,MAAM,GAClB,cAAc,CAAC,wBAAwB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAc3C,uBAAuB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,qBAAqB,CAAC;WAiEhE,OAAO,CAAC,CAAC,SAAS,OAAO,EACpC,QAAQ,EAAE,KAAK,EACf,MAAM,EAAE,YAAY,CAAC,CAAC,EAAE,QAAQ,CAAC,GAChC,OAAO,CAAC,iBAAiB,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC;IAU7C,OAAO,CAAC,gBAAgB;CAazB"}
|
package/dist/cjs/circleBridge.js
CHANGED
|
@@ -72,11 +72,36 @@ class AptosCircleBridge {
|
|
|
72
72
|
yield this.createUnsignedTx(txData, "Aptos.CircleBridge.Redeem");
|
|
73
73
|
}
|
|
74
74
|
async parseTransactionDetails(digest) {
|
|
75
|
-
const
|
|
76
|
-
const
|
|
77
|
-
|
|
75
|
+
const retries = 5;
|
|
76
|
+
const delay = 1000; // 1 second
|
|
77
|
+
let lastError;
|
|
78
|
+
let circleMessageSentEvent;
|
|
79
|
+
for (let attempts = 0; attempts < retries; attempts++) {
|
|
80
|
+
try {
|
|
81
|
+
const tx = await this.provider.getTransactionByHash({ transactionHash: digest });
|
|
82
|
+
const messageTransmitterId = this.messageTransmitterId.replace(/^0x0+/, "0x"); // remove any leading zeros to match event
|
|
83
|
+
circleMessageSentEvent = tx.events?.find((e) => e.type === `${messageTransmitterId}::message_transmitter::MessageSent`);
|
|
84
|
+
if (circleMessageSentEvent) {
|
|
85
|
+
// Success - break out of retry loop and continue processing
|
|
86
|
+
break;
|
|
87
|
+
}
|
|
88
|
+
// Event not found, treat as retriable error
|
|
89
|
+
lastError = new Error(`MessageSent event not found in transaction ${digest}`);
|
|
90
|
+
// Log retry attempt if not last attempt
|
|
91
|
+
if (attempts < retries - 1) {
|
|
92
|
+
await new Promise(resolve => setTimeout(resolve, delay));
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
catch (err) {
|
|
96
|
+
// Network or RPC error - save and retry
|
|
97
|
+
lastError = err;
|
|
98
|
+
if (attempts < retries - 1) {
|
|
99
|
+
await new Promise(resolve => setTimeout(resolve, delay));
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
}
|
|
78
103
|
if (!circleMessageSentEvent) {
|
|
79
|
-
throw new Error(
|
|
104
|
+
throw lastError || new Error(`No MessageSent event found after ${retries} attempts`);
|
|
80
105
|
}
|
|
81
106
|
const circleMessage = sdk_connect_1.encoding.hex.decode(circleMessageSentEvent.data.message);
|
|
82
107
|
const [msg, hash] = sdk_connect_1.CircleBridge.deserialize(circleMessage);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"circleBridge.js","sourceRoot":"","sources":["../../src/circleBridge.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"circleBridge.js","sourceRoot":"","sources":["../../src/circleBridge.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { Aptos } from "@aptos-labs/ts-sdk";
|
|
1
|
+
import type { Aptos } from "@aptos-labs/ts-sdk";
|
|
2
2
|
import { AptosUnsignedTransaction, type AptosChains } from "@wormhole-foundation/sdk-aptos";
|
|
3
|
-
import type { AccountAddress, ChainAddress, ChainsConfig, Network, Platform } from "@wormhole-foundation/sdk-connect";
|
|
4
|
-
import { CircleBridge
|
|
5
|
-
import { AptosCCTPMoveScripts } from "./moveScripts.js";
|
|
3
|
+
import type { AccountAddress, ChainAddress, ChainsConfig, Network, Platform, CircleTransferMessage, Contracts } from "@wormhole-foundation/sdk-connect";
|
|
4
|
+
import { CircleBridge } from "@wormhole-foundation/sdk-connect";
|
|
5
|
+
import type { AptosCCTPMoveScripts } from "./moveScripts.js";
|
|
6
6
|
export declare class AptosCircleBridge<N extends Network, C extends AptosChains> implements CircleBridge<N, C> {
|
|
7
7
|
readonly network: N;
|
|
8
8
|
readonly chain: C;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"circleBridge.d.ts","sourceRoot":"","sources":["../../src/circleBridge.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"circleBridge.d.ts","sourceRoot":"","sources":["../../src/circleBridge.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,KAAK,EAGmB,MAAM,oBAAoB,CAAC;AAOrD,OAAO,EAEL,wBAAwB,EACxB,KAAK,WAAW,EACjB,MAAM,gCAAgC,CAAC;AACxC,OAAO,KAAK,EACV,cAAc,EACd,YAAY,EACZ,YAAY,EACZ,OAAO,EACP,QAAQ,EAER,qBAAqB,EACrB,SAAS,EAAC,MAAM,kCAAkC,CAAC;AACrD,OAAO,EACL,YAAY,EAIb,MAAM,kCAAkC,CAAC;AAC1C,OAAO,KAAK,EAAE,oBAAoB,EAAC,MAAM,kBAAkB,CAAC;AAG5D,qBAAa,iBAAiB,CAAC,CAAC,SAAS,OAAO,EAAE,CAAC,SAAS,WAAW,CACrE,YAAW,YAAY,CAAC,CAAC,EAAE,CAAC,CAAC;IAQ3B,QAAQ,CAAC,OAAO,EAAE,CAAC;IACnB,QAAQ,CAAC,KAAK,EAAE,CAAC;IACjB,QAAQ,CAAC,QAAQ,EAAE,KAAK;IACxB,QAAQ,CAAC,SAAS,EAAE,SAAS;IAT/B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,oBAAoB,EAAE,MAAM,CAAC;IACtC,QAAQ,CAAC,WAAW,EAAE,oBAAoB,CAAC;gBAGhC,OAAO,EAAE,CAAC,EACV,KAAK,EAAE,CAAC,EACR,QAAQ,EAAE,KAAK,EACf,SAAS,EAAE,SAAS;IAyBxB,QAAQ,CACb,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC,EACzB,SAAS,EAAE,YAAY,EACvB,MAAM,EAAE,MAAM,GACb,cAAc,CAAC,wBAAwB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAiB3C,mBAAmB,CAAC,OAAO,EAAE,YAAY,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAgBnE,MAAM,CACX,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC,EACzB,OAAO,EAAE,YAAY,CAAC,OAAO,EAC7B,WAAW,EAAE,MAAM,GAClB,cAAc,CAAC,wBAAwB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAc3C,uBAAuB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,qBAAqB,CAAC;WAiEhE,OAAO,CAAC,CAAC,SAAS,OAAO,EACpC,QAAQ,EAAE,KAAK,EACf,MAAM,EAAE,YAAY,CAAC,CAAC,EAAE,QAAQ,CAAC,GAChC,OAAO,CAAC,iBAAiB,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC;IAU7C,OAAO,CAAC,gBAAgB;CAazB"}
|
package/dist/esm/circleBridge.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { AccountAddress as AptosAccountAddress, MoveVector, U32, U64
|
|
1
|
+
import { AccountAddress as AptosAccountAddress, MoveVector, U32, U64 } from "@aptos-labs/ts-sdk";
|
|
2
2
|
import { AptosPlatform, AptosUnsignedTransaction, } from "@wormhole-foundation/sdk-aptos";
|
|
3
3
|
import { CircleBridge, circle, encoding, keccak256, } from "@wormhole-foundation/sdk-connect";
|
|
4
4
|
import { aptosCCTPMoveScripts } from "./moveScripts.js";
|
|
@@ -69,11 +69,36 @@ export class AptosCircleBridge {
|
|
|
69
69
|
yield this.createUnsignedTx(txData, "Aptos.CircleBridge.Redeem");
|
|
70
70
|
}
|
|
71
71
|
async parseTransactionDetails(digest) {
|
|
72
|
-
const
|
|
73
|
-
const
|
|
74
|
-
|
|
72
|
+
const retries = 5;
|
|
73
|
+
const delay = 1000; // 1 second
|
|
74
|
+
let lastError;
|
|
75
|
+
let circleMessageSentEvent;
|
|
76
|
+
for (let attempts = 0; attempts < retries; attempts++) {
|
|
77
|
+
try {
|
|
78
|
+
const tx = await this.provider.getTransactionByHash({ transactionHash: digest });
|
|
79
|
+
const messageTransmitterId = this.messageTransmitterId.replace(/^0x0+/, "0x"); // remove any leading zeros to match event
|
|
80
|
+
circleMessageSentEvent = tx.events?.find((e) => e.type === `${messageTransmitterId}::message_transmitter::MessageSent`);
|
|
81
|
+
if (circleMessageSentEvent) {
|
|
82
|
+
// Success - break out of retry loop and continue processing
|
|
83
|
+
break;
|
|
84
|
+
}
|
|
85
|
+
// Event not found, treat as retriable error
|
|
86
|
+
lastError = new Error(`MessageSent event not found in transaction ${digest}`);
|
|
87
|
+
// Log retry attempt if not last attempt
|
|
88
|
+
if (attempts < retries - 1) {
|
|
89
|
+
await new Promise(resolve => setTimeout(resolve, delay));
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
catch (err) {
|
|
93
|
+
// Network or RPC error - save and retry
|
|
94
|
+
lastError = err;
|
|
95
|
+
if (attempts < retries - 1) {
|
|
96
|
+
await new Promise(resolve => setTimeout(resolve, delay));
|
|
97
|
+
}
|
|
98
|
+
}
|
|
99
|
+
}
|
|
75
100
|
if (!circleMessageSentEvent) {
|
|
76
|
-
throw new Error(
|
|
101
|
+
throw lastError || new Error(`No MessageSent event found after ${retries} attempts`);
|
|
77
102
|
}
|
|
78
103
|
const circleMessage = encoding.hex.decode(circleMessageSentEvent.data.message);
|
|
79
104
|
const [msg, hash] = CircleBridge.deserialize(circleMessage);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"circleBridge.js","sourceRoot":"","sources":["../../src/circleBridge.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"circleBridge.js","sourceRoot":"","sources":["../../src/circleBridge.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@wormhole-foundation/sdk-aptos-cctp",
|
|
3
|
-
"version": "3.4.
|
|
3
|
+
"version": "3.4.6",
|
|
4
4
|
"repository": {
|
|
5
5
|
"type": "git",
|
|
6
6
|
"url": "git+https://github.com/wormhole-foundation/wormhole-sdk-ts.git"
|
|
@@ -46,8 +46,8 @@
|
|
|
46
46
|
},
|
|
47
47
|
"dependencies": {
|
|
48
48
|
"@aptos-labs/ts-sdk": "^2.0.0",
|
|
49
|
-
"@wormhole-foundation/sdk-connect": "3.4.
|
|
50
|
-
"@wormhole-foundation/sdk-aptos": "3.4.
|
|
49
|
+
"@wormhole-foundation/sdk-connect": "3.4.6",
|
|
50
|
+
"@wormhole-foundation/sdk-aptos": "3.4.6"
|
|
51
51
|
},
|
|
52
52
|
"type": "module",
|
|
53
53
|
"exports": {
|