@wormhole-labs/base-bridge-executor-route 0.0.1-beta.1 → 0.0.1-beta.3
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/consts.d.ts +1 -0
- package/dist/cjs/consts.d.ts.map +1 -1
- package/dist/cjs/consts.js +9 -1
- package/dist/cjs/consts.js.map +1 -1
- package/dist/cjs/domain/messageProver/solanaProver.d.ts.map +1 -1
- package/dist/cjs/domain/messageProver/solanaProver.js +0 -9
- package/dist/cjs/domain/messageProver/solanaProver.js.map +1 -1
- package/dist/cjs/domain/solanaInstructionBuilder/solanaInstructionBuilder.d.ts +3 -2
- package/dist/cjs/domain/solanaInstructionBuilder/solanaInstructionBuilder.d.ts.map +1 -1
- package/dist/cjs/domain/solanaInstructionBuilder/solanaInstructionBuilder.js +210 -53
- package/dist/cjs/domain/solanaInstructionBuilder/solanaInstructionBuilder.js.map +1 -1
- package/dist/cjs/domain/solanaInstructionBuilder/tests/fakes/fakeSolanaInstructionBuilder.d.ts +1 -1
- package/dist/cjs/domain/solanaInstructionBuilder/tests/fakes/fakeSolanaInstructionBuilder.d.ts.map +1 -1
- package/dist/cjs/domain/solanaInstructionBuilder/tests/fakes/fakeSolanaInstructionBuilder.js +1 -1
- package/dist/cjs/domain/solanaInstructionBuilder/tests/fakes/fakeSolanaInstructionBuilder.js.map +1 -1
- package/dist/cjs/evm/baseBridgeExecutor.d.ts.map +1 -1
- package/dist/cjs/evm/baseBridgeExecutor.js +7 -7
- package/dist/cjs/evm/baseBridgeExecutor.js.map +1 -1
- package/dist/cjs/routes/baseBridgeBase.d.ts +5 -0
- package/dist/cjs/routes/baseBridgeBase.d.ts.map +1 -1
- package/dist/cjs/routes/baseBridgeBase.js +4 -1
- package/dist/cjs/routes/baseBridgeBase.js.map +1 -1
- package/dist/cjs/routes/baseBridgeRoute.d.ts.map +1 -1
- package/dist/cjs/routes/baseBridgeRoute.js +10 -2
- package/dist/cjs/routes/baseBridgeRoute.js.map +1 -1
- package/dist/cjs/routes/helpers.d.ts +4 -0
- package/dist/cjs/routes/helpers.d.ts.map +1 -1
- package/dist/cjs/routes/helpers.js +8 -1
- package/dist/cjs/routes/helpers.js.map +1 -1
- package/dist/cjs/svm/baseBridgeExecutor.d.ts +2 -1
- package/dist/cjs/svm/baseBridgeExecutor.d.ts.map +1 -1
- package/dist/cjs/svm/baseBridgeExecutor.js +100 -3
- package/dist/cjs/svm/baseBridgeExecutor.js.map +1 -1
- package/dist/cjs/types.d.ts +2 -1
- package/dist/cjs/types.d.ts.map +1 -1
- package/dist/esm/consts.d.ts +1 -0
- package/dist/esm/consts.d.ts.map +1 -1
- package/dist/esm/consts.js +8 -0
- package/dist/esm/consts.js.map +1 -1
- package/dist/esm/domain/messageProver/solanaProver.d.ts.map +1 -1
- package/dist/esm/domain/messageProver/solanaProver.js +0 -9
- package/dist/esm/domain/messageProver/solanaProver.js.map +1 -1
- package/dist/esm/domain/solanaInstructionBuilder/solanaInstructionBuilder.d.ts +3 -2
- package/dist/esm/domain/solanaInstructionBuilder/solanaInstructionBuilder.d.ts.map +1 -1
- package/dist/esm/domain/solanaInstructionBuilder/solanaInstructionBuilder.js +210 -53
- package/dist/esm/domain/solanaInstructionBuilder/solanaInstructionBuilder.js.map +1 -1
- package/dist/esm/domain/solanaInstructionBuilder/tests/fakes/fakeSolanaInstructionBuilder.d.ts +1 -1
- package/dist/esm/domain/solanaInstructionBuilder/tests/fakes/fakeSolanaInstructionBuilder.d.ts.map +1 -1
- package/dist/esm/domain/solanaInstructionBuilder/tests/fakes/fakeSolanaInstructionBuilder.js +1 -1
- package/dist/esm/domain/solanaInstructionBuilder/tests/fakes/fakeSolanaInstructionBuilder.js.map +1 -1
- package/dist/esm/evm/baseBridgeExecutor.d.ts.map +1 -1
- package/dist/esm/evm/baseBridgeExecutor.js +8 -8
- package/dist/esm/evm/baseBridgeExecutor.js.map +1 -1
- package/dist/esm/routes/baseBridgeBase.d.ts +5 -0
- package/dist/esm/routes/baseBridgeBase.d.ts.map +1 -1
- package/dist/esm/routes/baseBridgeBase.js +4 -1
- package/dist/esm/routes/baseBridgeBase.js.map +1 -1
- package/dist/esm/routes/baseBridgeRoute.d.ts.map +1 -1
- package/dist/esm/routes/baseBridgeRoute.js +10 -2
- package/dist/esm/routes/baseBridgeRoute.js.map +1 -1
- package/dist/esm/routes/helpers.d.ts +4 -0
- package/dist/esm/routes/helpers.d.ts.map +1 -1
- package/dist/esm/routes/helpers.js +8 -1
- package/dist/esm/routes/helpers.js.map +1 -1
- package/dist/esm/svm/baseBridgeExecutor.d.ts +2 -1
- package/dist/esm/svm/baseBridgeExecutor.d.ts.map +1 -1
- package/dist/esm/svm/baseBridgeExecutor.js +102 -5
- package/dist/esm/svm/baseBridgeExecutor.js.map +1 -1
- package/dist/esm/types.d.ts +2 -1
- package/dist/esm/types.d.ts.map +1 -1
- package/dist/tsconfig.cjs.tsbuildinfo +1 -1
- package/dist/tsconfig.esm.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -41,7 +41,7 @@ class EvmBaseBridgeExecutor {
|
|
|
41
41
|
}
|
|
42
42
|
async *transfer(sender, recipient, details) {
|
|
43
43
|
const senderAddress = new sdk_evm_1.EvmAddress(sender).toString();
|
|
44
|
-
const { tokenConfig, remainingAmount, remoteAmount, signedQuote, estimatedCost, relayInstructions, } = details;
|
|
44
|
+
const { tokenConfig, remainingAmount, remoteAmount, signedQuote, estimatedCost, relayInstructions, referrerFee, } = details;
|
|
45
45
|
if (!signedQuote) {
|
|
46
46
|
throw new Error("Missing signedQuote in details - required for executor");
|
|
47
47
|
}
|
|
@@ -51,8 +51,9 @@ class EvmBaseBridgeExecutor {
|
|
|
51
51
|
const tokenAddr = tokenConfig.baseAddress;
|
|
52
52
|
const tokenContract = sdk_evm_1.EvmPlatform.getTokenImplementation(this.provider, tokenAddr);
|
|
53
53
|
const allowance = await tokenContract.allowance(senderAddress, this.baseBridgeWithExecutorContract);
|
|
54
|
-
|
|
55
|
-
|
|
54
|
+
const totalAmount = remainingAmount + (referrerFee?.feeAmount ?? 0n);
|
|
55
|
+
if (allowance < totalAmount) {
|
|
56
|
+
const txReq = await tokenContract.approve.populateTransaction(this.baseBridgeWithExecutorContract, totalAmount);
|
|
56
57
|
yield this.createUnsignedTx((0, sdk_evm_1.addFrom)(txReq, senderAddress), "ERC20.approve for BaseBridgeWithExecutor", false);
|
|
57
58
|
}
|
|
58
59
|
const shimContract = new ethers_1.Contract(this.baseBridgeWithExecutorContract, baseBridgeWithExecutor_1.BASE_BRIDGE_WITH_EXECUTOR_ABI, this.provider);
|
|
@@ -86,9 +87,9 @@ class EvmBaseBridgeExecutor {
|
|
|
86
87
|
signedQuote: signedQuote,
|
|
87
88
|
instructions: `0x${Buffer.from(relayInstructions).toString("hex")}`,
|
|
88
89
|
}, {
|
|
89
|
-
transferTokenFee:
|
|
90
|
-
nativeTokenFee:
|
|
91
|
-
payee:
|
|
90
|
+
transferTokenFee: referrerFee?.feeAmount ?? 0n,
|
|
91
|
+
nativeTokenFee: 0n,
|
|
92
|
+
payee: referrerFee?.referrerAddress ?? ethers_1.ZeroAddress,
|
|
92
93
|
});
|
|
93
94
|
txReq.value = estimatedCost;
|
|
94
95
|
yield this.createUnsignedTx((0, sdk_evm_1.addFrom)(txReq, senderAddress), "BaseBridgeWithExecutor.bridgeToken", false);
|
|
@@ -120,7 +121,6 @@ class EvmBaseBridgeExecutor {
|
|
|
120
121
|
},
|
|
121
122
|
], this.provider);
|
|
122
123
|
const isCompleted = await bridgeContract.getFunction("successes")(messageHashToCheck);
|
|
123
|
-
console.log(` [Completion Check] messageHash: ${messageHashToCheck}, completed: ${isCompleted}`);
|
|
124
124
|
return isCompleted;
|
|
125
125
|
}
|
|
126
126
|
async *redeem(_sender, _proof) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"baseBridgeExecutor.js","sourceRoot":"","sources":["../../../src/evm/baseBridgeExecutor.ts"],"names":[],"mappings":";;;AAQA,kEAAkE;AAGlE,0DAMsC;AAEtC,
|
|
1
|
+
{"version":3,"file":"baseBridgeExecutor.js","sourceRoot":"","sources":["../../../src/evm/baseBridgeExecutor.ts"],"names":[],"mappings":";;;AAQA,kEAAkE;AAGlE,0DAMsC;AAEtC,mCAAoE;AACpE,6CAA4C;AAE5C,sCAGmB;AAEnB,2EAA+E;AAE/E,MAAa,qBAAqB;IAQrB;IACA;IACA;IACA;IARF,OAAO,CAAS;IAChB,kBAAkB,CAAS;IAC3B,8BAA8B,CAAS;IAEhD,YACW,OAAU,EACV,KAAQ,EACR,QAAkB,EAClB,SAAoB;QAHpB,YAAO,GAAP,OAAO,CAAG;QACV,UAAK,GAAL,KAAK,CAAG;QACR,aAAQ,GAAR,QAAQ,CAAU;QAClB,cAAS,GAAT,SAAS,CAAW;QAE7B,IAAI,CAAC,OAAO,GAAG,4BAAc,CAAC,2BAA2B,CAAC,GAAG,CAC3D,OAAO,EACP,KAAK,CACI,CAAC;QAEZ,MAAM,cAAc,GAAG,4BAAmB,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;QAC7D,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,4BAA4B,KAAK,YAAY,CAAC,CAAC;QACjE,CAAC;QACD,IAAI,CAAC,kBAAkB,GAAG,cAAc,CAAC;QAEzC,MAAM,YAAY,GAAG,wCAA+B,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;QACvE,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,MAAM,IAAI,KAAK,CACb,uCAAuC,KAAK,OAAO,OAAO,YAAY,CACvE,CAAC;QACJ,CAAC;QACD,IAAI,CAAC,8BAA8B,GAAG,YAAY,CAAC;IACrD,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,OAAO,CAClB,QAAkB,EAClB,MAAiC;QAEjC,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,GAAG,MAAM,qBAAW,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QAClE,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,CAAE,CAAC;QAC5B,IAAI,IAAI,CAAC,OAAO,KAAK,OAAO;YAC1B,MAAM,IAAI,KAAK,CAAC,qBAAqB,IAAI,CAAC,OAAO,OAAO,OAAO,EAAE,CAAC,CAAC;QACrE,OAAO,IAAI,qBAAqB,CAC9B,OAAY,EACZ,KAAK,EACL,QAAQ,EACR,IAAI,CAAC,SAAS,CACf,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,CAAC,QAAQ,CACb,MAAyB,EACzB,SAAuB,EACvB,OAA+B;QAE/B,MAAM,aAAa,GAAG,IAAI,oBAAU,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAC;QAExD,MAAM,EACJ,WAAW,EACX,eAAe,EACf,YAAY,EACZ,WAAW,EACX,aAAa,EACb,iBAAiB,EACjB,WAAW,GACZ,GAAG,OAAO,CAAC;QAEZ,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,wDAAwD,CAAC,CAAC;QAC5E,CAAC;QAED,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACvB,MAAM,IAAI,KAAK,CACb,8DAA8D,CAC/D,CAAC;QACJ,CAAC;QAED,MAAM,SAAS,GAAG,WAAW,CAAC,WAAW,CAAC;QAE1C,MAAM,aAAa,GAAG,qBAAW,CAAC,sBAAsB,CACtD,IAAI,CAAC,QAAQ,EACb,SAAS,CACV,CAAC;QAEF,MAAM,SAAS,GAAG,MAAM,aAAa,CAAC,SAAS,CAC7C,aAAa,EACb,IAAI,CAAC,8BAA8B,CACpC,CAAC;QAEF,MAAM,WAAW,GAAG,eAAe,GAAG,CAAC,WAAW,EAAE,SAAS,IAAI,EAAE,CAAC,CAAC;QAErE,IAAI,SAAS,GAAG,WAAW,EAAE,CAAC;YAC5B,MAAM,KAAK,GAAG,MAAM,aAAa,CAAC,OAAO,CAAC,mBAAmB,CAC3D,IAAI,CAAC,8BAA8B,EACnC,WAAW,CACZ,CAAC;YACF,MAAM,IAAI,CAAC,gBAAgB,CACzB,IAAA,iBAAO,EAAC,KAAK,EAAE,aAAa,CAAC,EAC7B,0CAA0C,EAC1C,KAAK,CACN,CAAC;QACJ,CAAC;QAED,MAAM,YAAY,GAAG,IAAI,iBAAQ,CAC/B,IAAI,CAAC,8BAA8B,EACnC,sDAA6B,EAC7B,IAAI,CAAC,QAAQ,CACd,CAAC;QAEF,MAAM,gBAAgB,GAAG,SAAS,CAAC,OAAO,CAAC,kBAAkB,EAAE,CAAC;QAChE,MAAM,cAAc,GAAG,gBAAgB,CAAC,YAAY,EAAE,CAAC;QACvD,MAAM,YAAY,GAAG,KAAK,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QAExE,wCAAwC;QACxC,IAAI,iBAAyB,CAAC;QAC9B,IAAI,WAAW,CAAC,aAAa,KAAK,QAAQ,EAAE,CAAC;YAC3C,MAAM,iBAAiB,GAAG,IAAI,mBAAS,CACrC,6CAA6C,CAC9C,CAAC;YACF,MAAM,gBAAgB,GAAG,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YAC1C,gBAAgB,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;YAClE,iBAAiB,GAAG,KAAK,gBAAgB,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QAC9D,CAAC;aAAM,CAAC;YACN,MAAM,gBAAgB,GAAG,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YAC1C,MAAM,YAAY,GAAG,IAAI,mBAAS,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC;YAC9D,MAAM,kBAAkB,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC,CAAC;YAC/D,gBAAgB,CAAC,GAAG,CAAC,kBAAkB,EAAE,CAAC,CAAC,CAAC;YAC5C,iBAAiB,GAAG,KAAK,gBAAgB,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QAC9D,CAAC;QAED,MAAM,KAAK,GAAG,MAAM,YAAY;aAC7B,WAAW,CAAC,aAAa,CAAC;aAC1B,mBAAmB,CAClB;YACE,UAAU,EAAE,SAAS;YACrB,WAAW,EAAE,iBAAiB;YAC9B,EAAE,EAAE,YAAY;YAChB,YAAY;SACb,EACD,EAAE,EACF;YACE,aAAa,EAAE,aAAa;YAC5B,WAAW,EAAE,WAAW;YACxB,YAAY,EAAE,KAAK,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;SACpE,EACD;YACE,gBAAgB,EAAE,WAAW,EAAE,SAAS,IAAI,EAAE;YAC9C,cAAc,EAAE,EAAE;YAClB,KAAK,EAAE,WAAW,EAAE,eAAe,IAAI,oBAAW;SACnD,CACF,CAAC;QAEJ,KAAK,CAAC,KAAK,GAAG,aAAa,CAAC;QAE5B,MAAM,IAAI,CAAC,gBAAgB,CACzB,IAAA,iBAAO,EAAC,KAAK,EAAE,aAAa,CAAC,EAC7B,oCAAoC,EACpC,KAAK,CACN,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,KAAa;QACrC,MAAM,SAAS,GAOX,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAEtB,uDAAuD;QACvD,6DAA6D;QAC7D,qEAAqE;QAErE,IAAI,kBAAkB,GAAG,SAAS,CAAC,WAAW,CAAC;QAE/C,IACE,SAAS,CAAC,qBAAqB;YAC/B,SAAS,CAAC,WAAW,KAAK,SAAS,EACnC,CAAC;YACD,MAAM,QAAQ,GAAG,iBAAQ,CAAC,eAAe,EAAE,CAAC;YAE5C,sEAAsE;YACtE,MAAM,gBAAgB,GAAG,IAAA,kBAAS,EAChC,QAAQ,CAAC,MAAM,CACb,CAAC,SAAS,EAAE,OAAO,EAAE,OAAO,CAAC,EAC7B,CAAC,SAAS,CAAC,MAAM,EAAE,SAAS,CAAC,WAAW,EAAE,SAAS,CAAC,IAAI,CAAC,CAC1D,CACF,CAAC;YAEF,kBAAkB,GAAG,IAAA,kBAAS,EAC5B,QAAQ,CAAC,MAAM,CACb,CAAC,QAAQ,EAAE,SAAS,EAAE,SAAS,CAAC,EAChC;gBACE,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC;gBACvB,SAAS,CAAC,qBAAqB;gBAC/B,gBAAgB;aACjB,CACF,CACF,CAAC;QACJ,CAAC;QAED,MAAM,cAAc,GAAG,IAAI,iBAAQ,CACjC,IAAI,CAAC,kBAAkB,EACvB;YACE;gBACE,IAAI,EAAE,UAAU;gBAChB,IAAI,EAAE,WAAW;gBACjB,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;gBAClD,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;gBAC5C,eAAe,EAAE,MAAM;aACxB;SACF,EACD,IAAI,CAAC,QAAQ,CACd,CAAC;QAEF,MAAM,WAAW,GAAG,MAAM,cAAc,CAAC,WAAW,CAAC,WAAW,CAAC,CAC/D,kBAAkB,CACnB,CAAC;QACF,OAAO,WAAW,CAAC;IACrB,CAAC;IAED,KAAK,CAAC,CAAC,MAAM,CACX,OAA0B,EAC1B,MAAc;QAEd,MAAM,IAAI,KAAK,CACb,qCAAqC;YACnC,+EAA+E;YAC/E,+DAA+D,CAClE,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,eAAe;QACnB,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,cAAc,EAAE,CAAC;QACzD,OAAO,MAAM,CAAC,WAAW,CAAC,CAAC;IAC7B,CAAC;IAEO,gBAAgB,CACtB,KAAyB,EACzB,WAAmB,EACnB,iBAA0B,KAAK;QAE/B,OAAO,IAAI,gCAAsB,CAC/B,IAAA,oBAAU,EAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,EAC/B,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,KAAK,EACV,WAAW,EACX,cAAc,CACf,CAAC;IACJ,CAAC;CACF;AA3PD,sDA2PC"}
|
|
@@ -28,6 +28,10 @@ export type Op = BaseBridgeExecutorRoute.Options;
|
|
|
28
28
|
export type Vp = BaseBridgeExecutorRoute.ValidatedParams;
|
|
29
29
|
export type Tp = routes.TransferParams<Op>;
|
|
30
30
|
export type Vr = routes.ValidationResult<Op>;
|
|
31
|
+
export type ReferrerFee = {
|
|
32
|
+
feeAmount: bigint;
|
|
33
|
+
referrerAddress: string;
|
|
34
|
+
};
|
|
31
35
|
export type BaseBridgeQuoteDetails = {
|
|
32
36
|
tokenConfig: ValidatedTokenConfig;
|
|
33
37
|
remainingAmount: bigint;
|
|
@@ -37,6 +41,7 @@ export type BaseBridgeQuoteDetails = {
|
|
|
37
41
|
expiryTime: Date;
|
|
38
42
|
signedQuote?: string;
|
|
39
43
|
relayInstructions?: Uint8Array;
|
|
44
|
+
referrerFee?: ReferrerFee;
|
|
40
45
|
};
|
|
41
46
|
export type Q = routes.Quote<Op, Vp, BaseBridgeQuoteDetails>;
|
|
42
47
|
export type Qr = routes.QuoteResult<Op, Vp>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"baseBridgeBase.d.ts","sourceRoot":"","sources":["../../../src/routes/baseBridgeBase.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACN,KAAK,EACL,YAAY,EACZ,YAAY,EACZ,gBAAgB,EAMhB,OAAO,EACP,MAAM,EACN,MAAM,EAEN,aAAa,EAGd,MAAM,kCAAkC,CAAC;AAI1C,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAGxD,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAG9C,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAElE,yBAAiB,uBAAuB,CAAC;IACvC,KAAY,OAAO,GAAG;QACpB,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB,CAAC;IAEF,KAAY,gBAAgB,GAAG;QAC7B,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC;KACvB,CAAC;IAEF,UAAiB,eACf,SAAQ,MAAM,CAAC,uBAAuB,CAAC,OAAO,CAAC;QAC/C,gBAAgB,EAAE,gBAAgB,CAAC;KACpC;IAED,KAAY,MAAM,GAAG;QACnB,eAAe,EAAE,MAAM,CAAC;QACxB,oBAAoB,CAAC,EAAE,MAAM,CAAC;QAC9B,iBAAiB,CAAC,EAAE,OAAO,CACzB,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAChD,CAAC;KACH,CAAC;IAEF,KAAY,WAAW,GAAG;QACxB,EAAE,EAAE,MAAM,CAAC;QACX,WAAW,EAAE,MAAM,CAAC;QACpB,YAAY,CAAC,EAAE,YAAY,CAAC;KAC7B,CAAC;CACH;AAED,MAAM,MAAM,EAAE,GAAG,uBAAuB,CAAC,OAAO,CAAC;AACjD,MAAM,MAAM,EAAE,GAAG,uBAAuB,CAAC,eAAe,CAAC;AAEzD,MAAM,MAAM,EAAE,GAAG,MAAM,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;AAC3C,MAAM,MAAM,EAAE,GAAG,MAAM,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC;AAE7C,MAAM,MAAM,sBAAsB,GAAG;IACnC,WAAW,EAAE,oBAAoB,CAAC;IAClC,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,IAAI,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,iBAAiB,CAAC,EAAE,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"baseBridgeBase.d.ts","sourceRoot":"","sources":["../../../src/routes/baseBridgeBase.ts"],"names":[],"mappings":"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"}
|
|
@@ -198,7 +198,10 @@ class BaseBridgeBaseRoute extends sdk_connect_1.routes.AutomaticRoute {
|
|
|
198
198
|
const toChain = this.wh.getChain(receipt.to);
|
|
199
199
|
const executor = await toChain.getProtocol("BaseBridgeExecutor");
|
|
200
200
|
const sender = sdk_connect_1.Wormhole.parseAddress(signer.chain(), signer.address());
|
|
201
|
-
const
|
|
201
|
+
const originTxHash = receipt.originTxs && receipt.originTxs[0]
|
|
202
|
+
? receipt.originTxs[0].txid
|
|
203
|
+
: undefined;
|
|
204
|
+
const xfer = executor.redeem(sender, receipt.attestation.attestation, originTxHash);
|
|
202
205
|
const dstTxIds = await (0, sdk_connect_1.signSendWait)(toChain, xfer, signer);
|
|
203
206
|
return {
|
|
204
207
|
...receipt,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"baseBridgeBase.js","sourceRoot":"","sources":["../../../src/routes/baseBridgeBase.ts"],"names":[],"mappings":";;;AAAA,kEAkB0C;AAC1C,0EAAmE;AACnE,6CAAwD;AACxD,iDAAkE;AAGlE,sCAAgD;AAChD,uCAA0D;AAE1D,6DAAyE;AACzE,2DAA+E;
|
|
1
|
+
{"version":3,"file":"baseBridgeBase.js","sourceRoot":"","sources":["../../../src/routes/baseBridgeBase.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"baseBridgeRoute.d.ts","sourceRoot":"","sources":["../../../src/routes/baseBridgeRoute.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAE7D,OAAO,EACL,YAAY,EAEZ,OAAO,EAER,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAE,MAAM,kCAAkC,CAAC;AAC1D,OAAO,EACL,mBAAmB,EACnB,uBAAuB,EAEvB,EAAE,EACF,EAAE,EACF,EAAE,EACF,EAAE,EACH,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,uBAAuB,EACvB,aAAa,EACd,MAAM,yBAAyB,CAAC;AAQjC,OAAO,EACL,kBAAkB,EAClB,oBAAoB,EACrB,MAAM,uBAAuB,CAAC;AAE/B,wBAAgB,eAAe,CAC7B,MAAM,EAAE,uBAAuB,CAAC,MAAM,EACtC,MAAM,EAAE,kBAAkB,EAAE;SAQF,CAAC,SAAS,OAAO;;gCAanB,aAAa;kEAmD3B,EAAE,GACT,OAAO,CAAC,EAAE,CAAC;+DA8DJ,EAAE,GACT,OAAO,CAAC,EAAE,CAAC;;;;;;;;;;;;;;;oBAzGS,CAAC,SAAS,OAAO,aAC3B,YAAY,CAAC,CAAC,CAAC,WACjB,YAAY,CAAC,CAAC,CAAC,GACvB,OAAO;+BAO8B,CAAC,SAAS,OAAO,eAC1C,OAAO,aACT,YAAY,CAAC,CAAC,CAAC,WACjB,YAAY,CAAC,CAAC,CAAC,GACvB,OAAO,CAAC,OAAO,EAAE,CAAC;;;;;;EA/BtB;AAED,qBAAa,eAAe,CAAC,CAAC,SAAS,OAAO,CAC5C,SAAQ,mBAAmB,CAAC,CAAC,CAC7B,YAAW,MAAM,CAAC,kBAAkB,CAAC,OAAO,eAAe,CAAC;IAE5D,QAAQ,CAAC,YAAY,MAAoC;IACzD,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAsC;IAE3E,MAAM,CAAC,MAAM,EAAE,uBAAuB,CAAC,MAAM,CAA2B;IACxE,MAAM,CAAC,QAAQ,EAAE,aAAa,CAAC;IAE/B,MAAM,CAAC,IAAI;;;MAGT;IAEF,MAAM,CAAC,eAAe,CAAC,CAAC,SAAS,OAAO,EACtC,SAAS,EAAE,YAAY,CAAC,CAAC,CAAC,EAC1B,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,GACvB,OAAO;WAOG,0BAA0B,CAAC,CAAC,SAAS,OAAO,EACvD,WAAW,EAAE,OAAO,EACpB,SAAS,EAAE,YAAY,CAAC,CAAC,CAAC,EAC1B,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,GACvB,OAAO,CAAC,OAAO,EAAE,CAAC;IAyBf,QAAQ,CACZ,OAAO,EAAE,MAAM,CAAC,oBAAoB,CAAC,CAAC,CAAC,EACvC,MAAM,EAAE,EAAE,GACT,OAAO,CAAC,EAAE,CAAC;IA4DR,KAAK,CACT,OAAO,EAAE,MAAM,CAAC,oBAAoB,CAAC,CAAC,CAAC,EACvC,MAAM,EAAE,EAAE,GACT,OAAO,CAAC,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"baseBridgeRoute.d.ts","sourceRoot":"","sources":["../../../src/routes/baseBridgeRoute.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAE7D,OAAO,EACL,YAAY,EAEZ,OAAO,EAER,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAE,MAAM,kCAAkC,CAAC;AAC1D,OAAO,EACL,mBAAmB,EACnB,uBAAuB,EAEvB,EAAE,EACF,EAAE,EACF,EAAE,EACF,EAAE,EACH,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,uBAAuB,EACvB,aAAa,EACd,MAAM,yBAAyB,CAAC;AAQjC,OAAO,EACL,kBAAkB,EAClB,oBAAoB,EACrB,MAAM,uBAAuB,CAAC;AAE/B,wBAAgB,eAAe,CAC7B,MAAM,EAAE,uBAAuB,CAAC,MAAM,EACtC,MAAM,EAAE,kBAAkB,EAAE;SAQF,CAAC,SAAS,OAAO;;gCAanB,aAAa;kEAmD3B,EAAE,GACT,OAAO,CAAC,EAAE,CAAC;+DA8DJ,EAAE,GACT,OAAO,CAAC,EAAE,CAAC;;;;;;;;;;;;;;;oBAzGS,CAAC,SAAS,OAAO,aAC3B,YAAY,CAAC,CAAC,CAAC,WACjB,YAAY,CAAC,CAAC,CAAC,GACvB,OAAO;+BAO8B,CAAC,SAAS,OAAO,eAC1C,OAAO,aACT,YAAY,CAAC,CAAC,CAAC,WACjB,YAAY,CAAC,CAAC,CAAC,GACvB,OAAO,CAAC,OAAO,EAAE,CAAC;;;;;;EA/BtB;AAED,qBAAa,eAAe,CAAC,CAAC,SAAS,OAAO,CAC5C,SAAQ,mBAAmB,CAAC,CAAC,CAC7B,YAAW,MAAM,CAAC,kBAAkB,CAAC,OAAO,eAAe,CAAC;IAE5D,QAAQ,CAAC,YAAY,MAAoC;IACzD,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAsC;IAE3E,MAAM,CAAC,MAAM,EAAE,uBAAuB,CAAC,MAAM,CAA2B;IACxE,MAAM,CAAC,QAAQ,EAAE,aAAa,CAAC;IAE/B,MAAM,CAAC,IAAI;;;MAGT;IAEF,MAAM,CAAC,eAAe,CAAC,CAAC,SAAS,OAAO,EACtC,SAAS,EAAE,YAAY,CAAC,CAAC,CAAC,EAC1B,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,GACvB,OAAO;WAOG,0BAA0B,CAAC,CAAC,SAAS,OAAO,EACvD,WAAW,EAAE,OAAO,EACpB,SAAS,EAAE,YAAY,CAAC,CAAC,CAAC,EAC1B,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,GACvB,OAAO,CAAC,OAAO,EAAE,CAAC;IAyBf,QAAQ,CACZ,OAAO,EAAE,MAAM,CAAC,oBAAoB,CAAC,CAAC,CAAC,EACvC,MAAM,EAAE,EAAE,GACT,OAAO,CAAC,EAAE,CAAC;IA4DR,KAAK,CACT,OAAO,EAAE,MAAM,CAAC,oBAAoB,CAAC,CAAC,CAAC,EACvC,MAAM,EAAE,EAAE,GACT,OAAO,CAAC,EAAE,CAAC;CAoIf"}
|
|
@@ -136,8 +136,12 @@ class BaseBridgeRoute extends baseBridgeBase_1.BaseBridgeBaseRoute {
|
|
|
136
136
|
// For Solana → Base, use simple quote logic (no executor needed)
|
|
137
137
|
// Amount stays in Solana decimals for burning - bridge handles conversion
|
|
138
138
|
const originalAmount = sdk_base_1.amount.units(params.normalizedParams.amount);
|
|
139
|
-
|
|
140
|
-
const
|
|
139
|
+
// Only calculate referrer fee if a referrer address is configured
|
|
140
|
+
const referrerAddress = this.staticConfig.referrerAddresses?.[fromChain.network]?.[fromChain.chain];
|
|
141
|
+
const referrerFeeAmount = referrerAddress && this.staticConfig.referrerFeeDbps > 0n
|
|
142
|
+
? (0, helpers_1.calculateReferrerFee)(originalAmount, this.staticConfig.referrerFeeDbps, this.staticConfig.referrerFeeThreshold)
|
|
143
|
+
: 0n;
|
|
144
|
+
const remainingAmount = originalAmount - referrerFeeAmount;
|
|
141
145
|
if (remainingAmount <= 0n) {
|
|
142
146
|
throw new Error("Amount after fee <= 0");
|
|
143
147
|
}
|
|
@@ -146,6 +150,9 @@ class BaseBridgeRoute extends baseBridgeBase_1.BaseBridgeBaseRoute {
|
|
|
146
150
|
estimatedCost: 0n, // no executor fee on Solana → Base
|
|
147
151
|
gasDropOff: 0n, // no gas drop-off on Solana → Base
|
|
148
152
|
expiryTime: new Date(Date.now() + 300_000),
|
|
153
|
+
referrerFee: referrerFeeAmount > 0n && referrerAddress
|
|
154
|
+
? { feeAmount: referrerFeeAmount, referrerAddress }
|
|
155
|
+
: undefined,
|
|
149
156
|
};
|
|
150
157
|
}
|
|
151
158
|
const eta = sdk_base_1.finality.estimateFinalityTime(fromChain.chain) + 1_000;
|
|
@@ -188,6 +195,7 @@ class BaseBridgeRoute extends baseBridgeBase_1.BaseBridgeBaseRoute {
|
|
|
188
195
|
expiryTime: quoteDetails.expiryTime,
|
|
189
196
|
signedQuote: quoteDetails.signedQuote,
|
|
190
197
|
relayInstructions: quoteDetails.relayInstructions,
|
|
198
|
+
referrerFee: quoteDetails.referrerFee,
|
|
191
199
|
},
|
|
192
200
|
};
|
|
193
201
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"baseBridgeRoute.js","sourceRoot":"","sources":["../../../src/routes/baseBridgeRoute.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"baseBridgeRoute.js","sourceRoot":"","sources":["../../../src/routes/baseBridgeRoute.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,10 @@ export type QuoteDetails = {
|
|
|
10
10
|
expiryTime: Date;
|
|
11
11
|
signedQuote?: string;
|
|
12
12
|
relayInstructions?: Uint8Array;
|
|
13
|
+
referrerFee?: {
|
|
14
|
+
feeAmount: bigint;
|
|
15
|
+
referrerAddress: string;
|
|
16
|
+
};
|
|
13
17
|
};
|
|
14
18
|
export declare function fetchBaseBridgeQuote(request: routes.RouteTransferRequest<Network>, params: BaseBridgeExecutorRoute.ValidatedParams, config: BaseBridgeExecutorRoute.Config, quoteFetcher: ExecutorQuoteFetcher, tokenConfig: {
|
|
15
19
|
solanaAddress: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../src/routes/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,EAEL,OAAO,EACP,MAAM,EAKP,MAAM,kCAAkC,CAAC;AAE1C,OAAO,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAO3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AAEtE,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAElD;AAED,wBAAgB,gBAAgB,CAAC,WAAW,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,GAAG,KAAK,CAQ5E;AAED,MAAM,MAAM,YAAY,GAAG;IACzB,eAAe,EAAE,MAAM,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,IAAI,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,iBAAiB,CAAC,EAAE,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../src/routes/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,EAEL,OAAO,EACP,MAAM,EAKP,MAAM,kCAAkC,CAAC;AAE1C,OAAO,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAO3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AAEtE,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAElD;AAED,wBAAgB,gBAAgB,CAAC,WAAW,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,GAAG,KAAK,CAQ5E;AAED,MAAM,MAAM,YAAY,GAAG;IACzB,eAAe,EAAE,MAAM,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,IAAI,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,iBAAiB,CAAC,EAAE,UAAU,CAAC;IAC/B,WAAW,CAAC,EAAE;QACZ,SAAS,EAAE,MAAM,CAAC;QAClB,eAAe,EAAE,MAAM,CAAC;KACzB,CAAC;CACH,CAAC;AAEF,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,MAAM,CAAC,oBAAoB,CAAC,OAAO,CAAC,EAC7C,MAAM,EAAE,uBAAuB,CAAC,eAAe,EAC/C,MAAM,EAAE,uBAAuB,CAAC,MAAM,EACtC,YAAY,EAAE,oBAAoB,EAClC,WAAW,EAAE;IACX,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;CACtB,GACA,OAAO,CAAC,YAAY,CAAC,CAiKvB;AAED,wBAAgB,oBAAoB,CAClC,cAAc,EAAE,MAAM,EACtB,eAAe,EAAE,MAAM,EACvB,oBAAoB,CAAC,EAAE,MAAM,GAC5B,MAAM,CAeR"}
|
|
@@ -25,7 +25,11 @@ async function fetchBaseBridgeQuote(request, params, config, quoteFetcher, token
|
|
|
25
25
|
// Calculate fees on source amount in source decimals
|
|
26
26
|
const sourceAmount = params.normalizedParams.amount;
|
|
27
27
|
const sourceUnits = sdk_connect_1.amount.units(sourceAmount);
|
|
28
|
-
|
|
28
|
+
// Only calculate referrer fee if a referrer address is configured
|
|
29
|
+
const referrerAddress = config.referrerAddresses?.[fromChain.network]?.[fromChain.chain];
|
|
30
|
+
const referrerFee = referrerAddress && config.referrerFeeDbps > 0n
|
|
31
|
+
? calculateReferrerFee(sourceUnits, config.referrerFeeDbps, config.referrerFeeThreshold)
|
|
32
|
+
: 0n;
|
|
29
33
|
const remainingSourceUnits = sourceUnits - referrerFee;
|
|
30
34
|
if (remainingSourceUnits <= 0n) {
|
|
31
35
|
throw new Error("Amount after fee <= 0");
|
|
@@ -127,6 +131,9 @@ async function fetchBaseBridgeQuote(request, params, config, quoteFetcher, token
|
|
|
127
131
|
expiryTime: new Date(Date.now() + 300_000), // 5 minutes
|
|
128
132
|
signedQuote: sdk_connect_1.encoding.hex.encode(signedQuoteBytes, true),
|
|
129
133
|
relayInstructions,
|
|
134
|
+
referrerFee: referrerFee > 0n && referrerAddress
|
|
135
|
+
? { feeAmount: referrerFee, referrerAddress }
|
|
136
|
+
: undefined,
|
|
130
137
|
};
|
|
131
138
|
}
|
|
132
139
|
function calculateReferrerFee(transferAmount, referrerFeeDbps, referrerFeeThreshold) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../src/routes/helpers.ts"],"names":[],"mappings":";;AAqBA,kCAEC;AAED,4CAQC;
|
|
1
|
+
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../src/routes/helpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,8 +23,9 @@ export declare class SvmBaseBridgeExecutor<N extends Network, C extends SolanaCh
|
|
|
23
23
|
static fromRpc<N extends Network>(provider: Connection, config: ChainsConfig<N, Platform>): Promise<SvmBaseBridgeExecutor<N, SolanaChains>>;
|
|
24
24
|
transfer(sender: AccountAddress<C>, recipient: ChainAddress, details: BaseBridgeQuoteDetails): AsyncGenerator<SolanaUnsignedTransaction<N, C>>;
|
|
25
25
|
isTransferCompleted(proof: string): Promise<boolean>;
|
|
26
|
-
redeem(sender: AccountAddress<C>, proof: string): AsyncGenerator<SolanaUnsignedTransaction<N, C>>;
|
|
26
|
+
redeem(sender: AccountAddress<C>, proof: string, baseTxHash?: string): AsyncGenerator<SolanaUnsignedTransaction<N, C>>;
|
|
27
27
|
getCurrentBlock(): Promise<bigint>;
|
|
28
|
+
private fetchRelayInstructionsFromBaseTx;
|
|
28
29
|
private createUnsignedTx;
|
|
29
30
|
}
|
|
30
31
|
//# sourceMappingURL=baseBridgeExecutor.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"baseBridgeExecutor.d.ts","sourceRoot":"","sources":["../../../src/svm/baseBridgeExecutor.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,cAAc,EACnB,KAAK,YAAY,EACjB,KAAK,YAAY,EACjB,KAAK,SAAS,EACd,KAAK,OAAO,EACZ,KAAK,QAAQ,EACd,MAAM,kCAAkC,CAAC;AAC1C,OAAO,KAAK,EACV,YAAY,EAEb,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAGL,yBAAyB,EAC1B,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"baseBridgeExecutor.d.ts","sourceRoot":"","sources":["../../../src/svm/baseBridgeExecutor.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,cAAc,EACnB,KAAK,YAAY,EACjB,KAAK,YAAY,EACjB,KAAK,SAAS,EACd,KAAK,OAAO,EACZ,KAAK,QAAQ,EACd,MAAM,kCAAkC,CAAC;AAC1C,OAAO,KAAK,EACV,YAAY,EAEb,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAGL,yBAAyB,EAC1B,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAQ9C,OAAO,EACL,UAAU,EAEV,SAAS,EAGV,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAUlE,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EACL,wBAAwB,EAEzB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,KAAK,EAAE,aAAa,EAAa,MAAM,yBAAyB,CAAC;AACxE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAE/D,qBAAa,qBAAqB,CAAC,CAAC,SAAS,OAAO,EAAE,CAAC,SAAS,YAAY,CAC1E,YAAW,kBAAkB,CAAC,CAAC,EAAE,CAAC,CAAC;IAOjC,QAAQ,CAAC,OAAO,EAAE,CAAC;IACnB,QAAQ,CAAC,KAAK,EAAE,CAAC;IACjB,QAAQ,CAAC,UAAU,EAAE,UAAU;IAC/B,QAAQ,CAAC,SAAS,EAAE,SAAS;IAC7B,QAAQ,CAAC,kBAAkB,EAAE,wBAAwB;IAIrD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC;IAblC,QAAQ,CAAC,mBAAmB,EAAE,SAAS,CAAC;IACxC,QAAQ,CAAC,oBAAoB,EAAE,SAAS,GAAG,IAAI,CAAC;IAChD,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAqB;gBAG7C,OAAO,EAAE,CAAC,EACV,KAAK,EAAE,CAAC,EACR,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,SAAS,EACpB,kBAAkB,EAAE,wBAAwB,EACrD,mBAAmB,EAAE,SAAS,EAC9B,oBAAoB,GAAE,SAAS,GAAG,IAAW,EAC7C,aAAa,CAAC,EAAE,aAAa,EACZ,cAAc,CAAC,EAAE,cAAc,YAAA,EAChD,kBAAkB,GAAE,OAAO,WAAyB;IAOtD,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,OAAO,EAAE,CAAC,SAAS,YAAY,EACrD,OAAO,EAAE,CAAC,EACV,KAAK,EAAE,CAAC,EACR,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,SAAS,GACnB,qBAAqB,CAAC,CAAC,EAAE,CAAC,CAAC;WA+BjB,OAAO,CAAC,CAAC,SAAS,OAAO,EACpC,QAAQ,EAAE,UAAU,EACpB,MAAM,EAAE,YAAY,CAAC,CAAC,EAAE,QAAQ,CAAC,GAChC,OAAO,CAAC,qBAAqB,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC;IAa3C,QAAQ,CACb,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC,EACzB,SAAS,EAAE,YAAY,EACvB,OAAO,EAAE,sBAAsB,GAC9B,cAAc,CAAC,yBAAyB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAsR5C,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAmBnD,MAAM,CACX,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC,EACzB,KAAK,EAAE,MAAM,EACb,UAAU,CAAC,EAAE,MAAM,GAClB,cAAc,CAAC,yBAAyB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAyC5C,eAAe,IAAI,OAAO,CAAC,MAAM,CAAC;YAK1B,gCAAgC;IA0E9C,OAAO,CAAC,gBAAgB;CAazB"}
|
|
@@ -74,6 +74,40 @@ class SvmBaseBridgeExecutor {
|
|
|
74
74
|
const rpc = (0, kit_1.createSolanaRpc)(this.connection.rpcEndpoint);
|
|
75
75
|
const bridgeAccount = await this.fetchBridgeAccount(rpc, (0, kit_1.address)(bridgePda.toBase58()));
|
|
76
76
|
const gasFeeReceiver = new web3_js_1.PublicKey(bridgeAccount.data.gasConfig.gasFeeReceiver);
|
|
77
|
+
// Add referrer fee transfer if configured
|
|
78
|
+
if (details.referrerFee) {
|
|
79
|
+
const { feeAmount, referrerAddress } = details.referrerFee;
|
|
80
|
+
const referrerPk = new web3_js_1.PublicKey(referrerAddress);
|
|
81
|
+
if (tokenConfig.transferType === "sol") {
|
|
82
|
+
// For native SOL, use SystemProgram.transfer
|
|
83
|
+
transaction.add(web3_js_1.SystemProgram.transfer({
|
|
84
|
+
fromPubkey: senderPk,
|
|
85
|
+
toPubkey: referrerPk,
|
|
86
|
+
lamports: feeAmount,
|
|
87
|
+
}));
|
|
88
|
+
}
|
|
89
|
+
else {
|
|
90
|
+
// For SPL tokens (spl or wrapped-token), transfer tokens to referrer's ATA
|
|
91
|
+
const tokenMint = new web3_js_1.PublicKey(tokenConfig.solanaAddress);
|
|
92
|
+
const mintAccountInfo = await this.connection.getAccountInfo(tokenMint);
|
|
93
|
+
if (!mintAccountInfo) {
|
|
94
|
+
throw new Error(`Token mint ${tokenConfig.solanaAddress} not found`);
|
|
95
|
+
}
|
|
96
|
+
const tokenProgramId = mintAccountInfo.owner.equals(spl_token_1.TOKEN_2022_PROGRAM_ID)
|
|
97
|
+
? spl_token_1.TOKEN_2022_PROGRAM_ID
|
|
98
|
+
: spl_token_1.TOKEN_PROGRAM_ID;
|
|
99
|
+
const senderAta = (0, spl_token_1.getAssociatedTokenAddressSync)(tokenMint, senderPk, true, tokenProgramId);
|
|
100
|
+
const referrerAta = (0, spl_token_1.getAssociatedTokenAddressSync)(tokenMint, referrerPk, true, tokenProgramId);
|
|
101
|
+
// Create referrer's ATA if it doesn't exist
|
|
102
|
+
const referrerAtaAccount = await this.connection.getAccountInfo(referrerAta);
|
|
103
|
+
if (!referrerAtaAccount) {
|
|
104
|
+
transaction.add((0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(senderPk, referrerAta, referrerPk, tokenMint, tokenProgramId));
|
|
105
|
+
}
|
|
106
|
+
// Transfer fee to referrer
|
|
107
|
+
const mintData = await (0, spl_token_1.getMint)(this.connection, tokenMint, undefined, tokenProgramId);
|
|
108
|
+
transaction.add((0, spl_token_1.createTransferCheckedInstruction)(senderAta, tokenMint, referrerAta, senderPk, feeAmount, mintData.decimals, undefined, tokenProgramId));
|
|
109
|
+
}
|
|
110
|
+
}
|
|
77
111
|
// Route to the correct instruction based on transfer type
|
|
78
112
|
let bridgeInstruction;
|
|
79
113
|
let description;
|
|
@@ -187,8 +221,7 @@ class SvmBaseBridgeExecutor {
|
|
|
187
221
|
});
|
|
188
222
|
return this.messageRelayer.isTransferCompleted(proofData.messageHash, this.baseBridgeProgramId);
|
|
189
223
|
}
|
|
190
|
-
|
|
191
|
-
async *redeem(sender, proof) {
|
|
224
|
+
async *redeem(sender, proof, baseTxHash) {
|
|
192
225
|
if (!this.messageRelayer) {
|
|
193
226
|
throw new Error("MessageRelayer not configured - required for redeem");
|
|
194
227
|
}
|
|
@@ -200,13 +233,77 @@ class SvmBaseBridgeExecutor {
|
|
|
200
233
|
});
|
|
201
234
|
const senderPk = new sdk_solana_1.SolanaAddress(sender).unwrap();
|
|
202
235
|
const bridgeBlockNumber = await this.messageRelayer.getBridgeBlockNumber(this.baseBridgeProgramId);
|
|
203
|
-
|
|
236
|
+
let relayInstructions;
|
|
237
|
+
if (baseTxHash) {
|
|
238
|
+
try {
|
|
239
|
+
relayInstructions = await this.fetchRelayInstructionsFromBaseTx(baseTxHash);
|
|
240
|
+
}
|
|
241
|
+
catch (e) { }
|
|
242
|
+
}
|
|
243
|
+
const transaction = await this.instructionBuilder.buildRedeemTransaction(proofData, senderPk, this.baseBridgeProgramId, bridgeBlockNumber, this.connection, relayInstructions);
|
|
204
244
|
yield this.createUnsignedTx({ transaction }, "SvmBaseBridgeExecutor.redeem");
|
|
205
245
|
}
|
|
206
246
|
async getCurrentBlock() {
|
|
207
247
|
const slot = await this.connection.getSlot();
|
|
208
248
|
return BigInt(slot);
|
|
209
249
|
}
|
|
250
|
+
async fetchRelayInstructionsFromBaseTx(baseTxHash) {
|
|
251
|
+
const { createPublicClient, http, decodeEventLog } = require("viem");
|
|
252
|
+
const { baseSepolia, base } = require("viem/chains");
|
|
253
|
+
const sourceChain = this.network === "Testnet" ? "BaseSepolia" : "Base";
|
|
254
|
+
const executorAddress = consts_1.baseExecutorContracts[this.network]?.[sourceChain];
|
|
255
|
+
if (!executorAddress) {
|
|
256
|
+
throw new Error(`Executor contract for ${sourceChain} on ${this.network} not found`);
|
|
257
|
+
}
|
|
258
|
+
const chain = this.network === "Testnet" ? baseSepolia : base;
|
|
259
|
+
const client = createPublicClient({
|
|
260
|
+
chain,
|
|
261
|
+
transport: http(),
|
|
262
|
+
});
|
|
263
|
+
const receipt = await client.getTransactionReceipt({
|
|
264
|
+
hash: baseTxHash,
|
|
265
|
+
});
|
|
266
|
+
if (!receipt) {
|
|
267
|
+
throw new Error("Base transaction receipt not found");
|
|
268
|
+
}
|
|
269
|
+
const requestForExecutionAbi = [
|
|
270
|
+
{
|
|
271
|
+
type: "event",
|
|
272
|
+
name: "RequestForExecution",
|
|
273
|
+
inputs: [
|
|
274
|
+
{ name: "quoterAddress", type: "address", indexed: true },
|
|
275
|
+
{ name: "amtPaid", type: "uint256", indexed: false },
|
|
276
|
+
{ name: "dstChain", type: "uint16", indexed: false },
|
|
277
|
+
{ name: "dstAddr", type: "bytes32", indexed: false },
|
|
278
|
+
{ name: "refundAddr", type: "address", indexed: false },
|
|
279
|
+
{ name: "signedQuote", type: "bytes", indexed: false },
|
|
280
|
+
{ name: "requestBytes", type: "bytes", indexed: false },
|
|
281
|
+
{ name: "relayInstructions", type: "bytes", indexed: false },
|
|
282
|
+
],
|
|
283
|
+
},
|
|
284
|
+
];
|
|
285
|
+
for (const log of receipt.logs) {
|
|
286
|
+
if (log.address.toLowerCase() !== executorAddress.toLowerCase()) {
|
|
287
|
+
continue;
|
|
288
|
+
}
|
|
289
|
+
try {
|
|
290
|
+
const decodedLog = decodeEventLog({
|
|
291
|
+
abi: requestForExecutionAbi,
|
|
292
|
+
data: log.data,
|
|
293
|
+
topics: log.topics,
|
|
294
|
+
});
|
|
295
|
+
if (decodedLog.eventName === "RequestForExecution") {
|
|
296
|
+
const relayInstructionsHex = decodedLog.args
|
|
297
|
+
.relayInstructions;
|
|
298
|
+
return Buffer.from(relayInstructionsHex.slice(2), "hex");
|
|
299
|
+
}
|
|
300
|
+
}
|
|
301
|
+
catch (e) {
|
|
302
|
+
continue;
|
|
303
|
+
}
|
|
304
|
+
}
|
|
305
|
+
throw new Error("RequestForExecution event not found in executor contract logs");
|
|
306
|
+
}
|
|
210
307
|
createUnsignedTx(txReq, description, parallelizable = false) {
|
|
211
308
|
return new sdk_solana_1.SolanaUnsignedTransaction(txReq, this.network, this.chain, description, parallelizable);
|
|
212
309
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"baseBridgeExecutor.js","sourceRoot":"","sources":["../../../src/svm/baseBridgeExecutor.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"baseBridgeExecutor.js","sourceRoot":"","sources":["../../../src/svm/baseBridgeExecutor.ts"],"names":[],"mappings":"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"}
|
package/dist/cjs/types.d.ts
CHANGED
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { Chain, AccountAddress, ChainAddress, UnsignedTransaction, Network } from "@wormhole-foundation/sdk-connect";
|
|
2
2
|
import { BaseBridgeQuoteDetails } from "./routes/baseBridgeBase";
|
|
3
|
+
export type TokenType = "sol" | "spl" | "wrapped";
|
|
3
4
|
export interface BaseBridgeExecutor<N extends Network = Network, C extends Chain = Chain> {
|
|
4
5
|
transfer(sender: AccountAddress<C>, recipient: ChainAddress, details: BaseBridgeQuoteDetails): AsyncGenerator<UnsignedTransaction<N, C>>;
|
|
5
6
|
isTransferCompleted(proof: string): Promise<boolean>;
|
|
6
|
-
redeem(sender: AccountAddress<C>, proof: string): AsyncGenerator<UnsignedTransaction<N, C>>;
|
|
7
|
+
redeem(sender: AccountAddress<C>, proof: string, baseTxHash?: string): AsyncGenerator<UnsignedTransaction<N, C>>;
|
|
7
8
|
getCurrentBlock(): Promise<bigint>;
|
|
8
9
|
}
|
|
9
10
|
//# sourceMappingURL=types.d.ts.map
|
package/dist/cjs/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,EACL,cAAc,EACd,YAAY,EACZ,mBAAmB,EACnB,OAAO,EACR,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AAEjE,MAAM,WAAW,kBAAkB,CACjC,CAAC,SAAS,OAAO,GAAG,OAAO,EAC3B,CAAC,SAAS,KAAK,GAAG,KAAK;IAEvB,QAAQ,CACN,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC,EACzB,SAAS,EAAE,YAAY,EACvB,OAAO,EAAE,sBAAsB,GAC9B,cAAc,CAAC,mBAAmB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAE7C,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAErD,MAAM,CACJ,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC,EACzB,KAAK,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,EACL,cAAc,EACd,YAAY,EACZ,mBAAmB,EACnB,OAAO,EACR,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AAEjE,MAAM,MAAM,SAAS,GAAG,KAAK,GAAG,KAAK,GAAG,SAAS,CAAC;AAElD,MAAM,WAAW,kBAAkB,CACjC,CAAC,SAAS,OAAO,GAAG,OAAO,EAC3B,CAAC,SAAS,KAAK,GAAG,KAAK;IAEvB,QAAQ,CACN,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC,EACzB,SAAS,EAAE,YAAY,EACvB,OAAO,EAAE,sBAAsB,GAC9B,cAAc,CAAC,mBAAmB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAE7C,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAErD,MAAM,CACJ,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC,EACzB,KAAK,EAAE,MAAM,EACb,UAAU,CAAC,EAAE,MAAM,GAClB,cAAc,CAAC,mBAAmB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAE7C,eAAe,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;CACpC"}
|
package/dist/esm/consts.d.ts
CHANGED
|
@@ -3,6 +3,7 @@ export declare const apiBaseUrl: Partial<Record<Network, string>>;
|
|
|
3
3
|
export declare const baseBridgeContracts: Partial<Record<Network, Partial<Record<Chain, string>>>>;
|
|
4
4
|
export declare const baseBridgeWithExecutorContracts: Partial<Record<Network, Partial<Record<Chain, string>>>>;
|
|
5
5
|
export declare const baseRelayerContracts: Partial<Record<Network, Partial<Record<"Solana", string>>>>;
|
|
6
|
+
export declare const baseExecutorContracts: Partial<Record<Network, Partial<Record<Chain, string>>>>;
|
|
6
7
|
export declare const gasLimits: Partial<Record<Network, Partial<Record<Chain, bigint>>>>;
|
|
7
8
|
export declare const SOLANA_MSG_VALUE_BASE_FEE = 5001n;
|
|
8
9
|
export declare const SOLANA_BASE_RELAY_GAS_LIMIT = 1000000n;
|
package/dist/esm/consts.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"consts.d.ts","sourceRoot":"","sources":["../../src/consts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,kCAAkC,CAAC;AAElE,eAAO,MAAM,UAAU,EAAE,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,CAIvD,CAAC;AAEF,eAAO,MAAM,mBAAmB,EAAE,OAAO,CACvC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAUhD,CAAC;AAEF,eAAO,MAAM,+BAA+B,EAAE,OAAO,CACnD,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAQhD,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,OAAO,CACxC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,CAQnD,CAAC;AAEF,eAAO,MAAM,SAAS,EAAE,OAAO,CAC7B,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAUhD,CAAC;AAEF,eAAO,MAAM,yBAAyB,QAAS,CAAC;AAEhD,eAAO,MAAM,2BAA2B,WAAa,CAAC"}
|
|
1
|
+
{"version":3,"file":"consts.d.ts","sourceRoot":"","sources":["../../src/consts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,kCAAkC,CAAC;AAElE,eAAO,MAAM,UAAU,EAAE,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,CAIvD,CAAC;AAEF,eAAO,MAAM,mBAAmB,EAAE,OAAO,CACvC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAUhD,CAAC;AAEF,eAAO,MAAM,+BAA+B,EAAE,OAAO,CACnD,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAQhD,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,OAAO,CACxC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,CAQnD,CAAC;AAEF,eAAO,MAAM,qBAAqB,EAAE,OAAO,CACzC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAQhD,CAAC;AAEF,eAAO,MAAM,SAAS,EAAE,OAAO,CAC7B,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAUhD,CAAC;AAEF,eAAO,MAAM,yBAAyB,QAAS,CAAC;AAEhD,eAAO,MAAM,2BAA2B,WAAa,CAAC"}
|
package/dist/esm/consts.js
CHANGED
|
@@ -28,6 +28,14 @@ export const baseRelayerContracts = {
|
|
|
28
28
|
Solana: "g1et5VenhfJHJwsdJsDbxWZuotD5H4iELNG61kS4fb9",
|
|
29
29
|
},
|
|
30
30
|
};
|
|
31
|
+
export const baseExecutorContracts = {
|
|
32
|
+
Testnet: {
|
|
33
|
+
BaseSepolia: "0x51B47D493CBA7aB97e3F8F163D6Ce07592CE4482",
|
|
34
|
+
},
|
|
35
|
+
Mainnet: {
|
|
36
|
+
Base: "0x9E1936E91A4a5AE5A5F75fFc472D6cb8e93597ea",
|
|
37
|
+
},
|
|
38
|
+
};
|
|
31
39
|
export const gasLimits = {
|
|
32
40
|
Testnet: {
|
|
33
41
|
BaseSepolia: 250000n,
|
package/dist/esm/consts.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"consts.js","sourceRoot":"","sources":["../../src/consts.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,UAAU,GAAqC;IAC1D,OAAO,EACL,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,IAAI,uCAAuC;IAC5E,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,IAAI,+BAA+B;CAC5E,CAAC;AAEF,MAAM,CAAC,MAAM,mBAAmB,GAE5B;IACF,OAAO,EAAE;QACP,WAAW,EAAE,4CAA4C;QACzD,MAAM,EAAE,8CAA8C;KACvD;IACD,OAAO,EAAE;QACP,IAAI,EAAE,4CAA4C;QAClD,MAAM,EAAE,8CAA8C;KACvD;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,+BAA+B,GAExC;IACF,OAAO,EAAE;QACP,WAAW,EAAE,4CAA4C;KAC1D;IACD,OAAO,EAAE;QACP,IAAI,EAAE,4CAA4C;KACnD;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,oBAAoB,GAE7B;IACF,OAAO,EAAE;QACP,MAAM,EAAE,8CAA8C;KACvD;IACD,OAAO,EAAE;QACP,MAAM,EAAE,6CAA6C;KACtD;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,SAAS,GAElB;IACF,OAAO,EAAE;QACP,WAAW,EAAE,OAAQ;QACrB,MAAM,EAAE,OAAQ;KACjB;IACD,OAAO,EAAE;QACP,IAAI,EAAE,OAAQ;QACd,MAAM,EAAE,OAAQ;KACjB;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,yBAAyB,GAAG,KAAM,CAAC;AAEhD,MAAM,CAAC,MAAM,2BAA2B,GAAG,QAAU,CAAC"}
|
|
1
|
+
{"version":3,"file":"consts.js","sourceRoot":"","sources":["../../src/consts.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,UAAU,GAAqC;IAC1D,OAAO,EACL,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,IAAI,uCAAuC;IAC5E,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,IAAI,+BAA+B;CAC5E,CAAC;AAEF,MAAM,CAAC,MAAM,mBAAmB,GAE5B;IACF,OAAO,EAAE;QACP,WAAW,EAAE,4CAA4C;QACzD,MAAM,EAAE,8CAA8C;KACvD;IACD,OAAO,EAAE;QACP,IAAI,EAAE,4CAA4C;QAClD,MAAM,EAAE,8CAA8C;KACvD;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,+BAA+B,GAExC;IACF,OAAO,EAAE;QACP,WAAW,EAAE,4CAA4C;KAC1D;IACD,OAAO,EAAE;QACP,IAAI,EAAE,4CAA4C;KACnD;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,oBAAoB,GAE7B;IACF,OAAO,EAAE;QACP,MAAM,EAAE,8CAA8C;KACvD;IACD,OAAO,EAAE;QACP,MAAM,EAAE,6CAA6C;KACtD;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,qBAAqB,GAE9B;IACF,OAAO,EAAE;QACP,WAAW,EAAE,4CAA4C;KAC1D;IACD,OAAO,EAAE;QACP,IAAI,EAAE,4CAA4C;KACnD;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,SAAS,GAElB;IACF,OAAO,EAAE;QACP,WAAW,EAAE,OAAQ;QACrB,MAAM,EAAE,OAAQ;KACjB;IACD,OAAO,EAAE;QACP,IAAI,EAAE,OAAQ;QACd,MAAM,EAAE,OAAQ;KACjB;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,yBAAyB,GAAG,KAAM,CAAC;AAEhD,MAAM,CAAC,MAAM,2BAA2B,GAAG,QAAU,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"solanaProver.d.ts","sourceRoot":"","sources":["../../../../src/domain/messageProver/solanaProver.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,OAAO,EACP,aAAa,EACd,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAc,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAExD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,MAAM,CAAC;AAChC,OAAO,KAAK,EAAE,aAAa,EAAE,SAAS,EAAgB,MAAM,cAAc,CAAC;AAE3E,qBAAa,YAAa,YAAW,aAAa;IAE9C,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,eAAe;gBADf,YAAY,EAAE,YAAY,CAAC,OAAO,CAAC,EACnC,eAAe,EAAE,SAAS;IAGvC,KAAK,CACT,QAAQ,EAAE,aAAa,EACvB,kBAAkB,EAAE,MAAM,GACzB,OAAO,CAAC,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"solanaProver.d.ts","sourceRoot":"","sources":["../../../../src/domain/messageProver/solanaProver.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,OAAO,EACP,aAAa,EACd,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAc,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAExD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,MAAM,CAAC;AAChC,OAAO,KAAK,EAAE,aAAa,EAAE,SAAS,EAAgB,MAAM,cAAc,CAAC;AAE3E,qBAAa,YAAa,YAAW,aAAa;IAE9C,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,eAAe;gBADf,YAAY,EAAE,YAAY,CAAC,OAAO,CAAC,EACnC,eAAe,EAAE,SAAS;IAGvC,KAAK,CACT,QAAQ,EAAE,aAAa,EACvB,kBAAkB,EAAE,MAAM,GACzB,OAAO,CAAC,SAAS,CAAC;YA4NP,sBAAsB;CAuCrC;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,SAAS,GAAG,GAAG,CASxD"}
|