@theliem/xmarket-sdk 3.8.0 → 3.9.0
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/index.js +22 -10
- package/dist/index.js.map +1 -1
- package/dist/index.mjs +22 -10
- package/dist/index.mjs.map +1 -1
- package/package.json +1 -1
package/dist/index.js
CHANGED
|
@@ -1967,7 +1967,7 @@ ${logs.join("\n")}`);
|
|
|
1967
1967
|
{ pubkey: hookConfig, isSigner: false, isWritable: false },
|
|
1968
1968
|
{ pubkey: hookProgram, isSigner: false, isWritable: false }
|
|
1969
1969
|
);
|
|
1970
|
-
const matchIx = await this.program.methods.matchMintOrders(takerNonce, fillAmount).accounts({
|
|
1970
|
+
const matchIx = await this.program.methods.matchMintOrders(takerNonce, fillAmount, true).accounts({
|
|
1971
1971
|
operator: operatorWallet.publicKey,
|
|
1972
1972
|
payer: this.walletPubkey,
|
|
1973
1973
|
clobConfig,
|
|
@@ -2063,17 +2063,21 @@ ${logs.join("\n")}`);
|
|
|
2063
2063
|
if (yesSigned.order.fee.gtn(0) && this.programIds.feeManagement && this.feeConfigOwner) {
|
|
2064
2064
|
const companyAddr = await this.companyAddress();
|
|
2065
2065
|
if (companyAddr) {
|
|
2066
|
-
const
|
|
2067
|
-
|
|
2068
|
-
|
|
2069
|
-
|
|
2070
|
-
|
|
2071
|
-
|
|
2072
|
-
|
|
2073
|
-
|
|
2066
|
+
const feeOverridePda = PDA.marketFeeOverride(condition, this.programIds)[0];
|
|
2067
|
+
const feeOverrideExists = await this.provider.connection.getAccountInfo(feeOverridePda);
|
|
2068
|
+
if (feeOverrideExists) {
|
|
2069
|
+
const oracleVault = opts?.marketOracleVault ?? this.walletPubkey;
|
|
2070
|
+
remainingAccounts.push(
|
|
2071
|
+
{ pubkey: this.programIds.feeManagement, isSigner: false, isWritable: false },
|
|
2072
|
+
{ pubkey: PDA.feeConfig(this.feeConfigOwner, this.programIds)[0], isSigner: false, isWritable: false },
|
|
2073
|
+
{ pubkey: feeOverridePda, isSigner: false, isWritable: false },
|
|
2074
|
+
{ pubkey: splToken.getAssociatedTokenAddressSync(collateralMint, companyAddr), isSigner: false, isWritable: true },
|
|
2075
|
+
{ pubkey: oracleVault, isSigner: false, isWritable: true }
|
|
2076
|
+
);
|
|
2077
|
+
}
|
|
2074
2078
|
}
|
|
2075
2079
|
}
|
|
2076
|
-
const matchIx = await this.program.methods.matchMergeOrders(takerNonce, fillAmount).accounts({
|
|
2080
|
+
const matchIx = await this.program.methods.matchMergeOrders(takerNonce, fillAmount, true).accounts({
|
|
2077
2081
|
operator: operatorWallet.publicKey,
|
|
2078
2082
|
payer: this.walletPubkey,
|
|
2079
2083
|
clobConfig,
|
|
@@ -9126,6 +9130,10 @@ var clob_exchange_default = {
|
|
|
9126
9130
|
{
|
|
9127
9131
|
name: "fill_amount",
|
|
9128
9132
|
type: "u64"
|
|
9133
|
+
},
|
|
9134
|
+
{
|
|
9135
|
+
name: "skip_crossing_check",
|
|
9136
|
+
type: "bool"
|
|
9129
9137
|
}
|
|
9130
9138
|
]
|
|
9131
9139
|
},
|
|
@@ -9417,6 +9425,10 @@ var clob_exchange_default = {
|
|
|
9417
9425
|
{
|
|
9418
9426
|
name: "fill_amount",
|
|
9419
9427
|
type: "u64"
|
|
9428
|
+
},
|
|
9429
|
+
{
|
|
9430
|
+
name: "skip_crossing_check",
|
|
9431
|
+
type: "bool"
|
|
9420
9432
|
}
|
|
9421
9433
|
]
|
|
9422
9434
|
},
|