@gobob/bob-sdk 4.4.11-rc3 → 4.4.11-rc5
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/gateway/adapters/okx-wallet.d.ts +3 -3
- package/dist/gateway/adapters/okx-wallet.js +1 -1
- package/dist/gateway/adapters/okx-wallet.js.map +1 -1
- package/dist/gateway/adapters/reown.d.ts +1 -1
- package/dist/gateway/adapters/reown.js +3 -3
- package/dist/gateway/adapters/reown.js.map +1 -1
- package/dist/gateway/client.js +29 -7
- package/dist/gateway/client.js.map +1 -1
- package/dist/gateway/types/bitcoin.d.ts +3 -3
- package/dist/gateway/utils/bitcoin-signer.d.ts +1 -1
- package/dist/gateway/utils/bitcoin-signer.js +2 -2
- package/dist/gateway/utils/bitcoin-signer.js.map +1 -1
- package/package.json +1 -1
|
@@ -4,7 +4,7 @@ interface OkxWalletProvider {
|
|
|
4
4
|
from: string;
|
|
5
5
|
to: string;
|
|
6
6
|
value: string;
|
|
7
|
-
memo
|
|
7
|
+
memo?: string;
|
|
8
8
|
}) => Promise<{
|
|
9
9
|
txhash: string;
|
|
10
10
|
}>;
|
|
@@ -16,8 +16,8 @@ export declare class OkxWalletAdapter implements BitcoinSigner {
|
|
|
16
16
|
from: string;
|
|
17
17
|
to: string;
|
|
18
18
|
value: string;
|
|
19
|
-
opReturn
|
|
20
|
-
isSignet
|
|
19
|
+
opReturn?: string;
|
|
20
|
+
isSignet?: boolean;
|
|
21
21
|
}): Promise<string>;
|
|
22
22
|
}
|
|
23
23
|
export {};
|
|
@@ -15,7 +15,7 @@ class OkxWalletAdapter {
|
|
|
15
15
|
value,
|
|
16
16
|
memo: opReturn,
|
|
17
17
|
});
|
|
18
|
-
const network = (0, wallet_1.getAddressInfo)(to, isSignet).network;
|
|
18
|
+
const network = (0, wallet_1.getAddressInfo)(to, isSignet || false).network;
|
|
19
19
|
const esploraClient = new esplora_1.EsploraClient(network);
|
|
20
20
|
return esploraClient.getTransactionHex(txhash);
|
|
21
21
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"okx-wallet.js","sourceRoot":"","sources":["../../../src/gateway/adapters/okx-wallet.ts"],"names":[],"mappings":";;;AAAA,2CAA8C;AAE9C,yCAA8C;AAO9C,MAAa,gBAAgB;IACzB,cAAc,CAAoB;IAElC,YAAY,cAAiC;QACzC,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;IACzC,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,EACd,IAAI,EACJ,EAAE,EACF,KAAK,EACL,QAAQ,EACR,QAAQ,GAOX;QACG,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC;YAC9C,IAAI;YACJ,EAAE;YACF,KAAK;YACL,IAAI,EAAE,QAAQ;SACjB,CAAC,CAAC;QAEH,MAAM,OAAO,GAAG,IAAA,uBAAc,EAAC,EAAE,EAAE,QAAQ,CAAC,CAAC,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"okx-wallet.js","sourceRoot":"","sources":["../../../src/gateway/adapters/okx-wallet.ts"],"names":[],"mappings":";;;AAAA,2CAA8C;AAE9C,yCAA8C;AAO9C,MAAa,gBAAgB;IACzB,cAAc,CAAoB;IAElC,YAAY,cAAiC;QACzC,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;IACzC,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,EACd,IAAI,EACJ,EAAE,EACF,KAAK,EACL,QAAQ,EACR,QAAQ,GAOX;QACG,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC;YAC9C,IAAI;YACJ,EAAE;YACF,KAAK;YACL,IAAI,EAAE,QAAQ;SACjB,CAAC,CAAC;QAEH,MAAM,OAAO,GAAG,IAAA,uBAAc,EAAC,EAAE,EAAE,QAAQ,IAAI,KAAK,CAAC,CAAC,OAAO,CAAC;QAC9D,MAAM,aAAa,GAAG,IAAI,uBAAa,CAAC,OAAO,CAAC,CAAC;QACjD,OAAO,aAAa,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;IACnD,CAAC;CACJ;AA/BD,4CA+BC"}
|
|
@@ -16,6 +16,6 @@ export declare class ReownWalletAdapter implements BitcoinSigner {
|
|
|
16
16
|
walletProvider: ReownWalletProvider;
|
|
17
17
|
userAddress: string;
|
|
18
18
|
constructor(walletProvider: ReownWalletProvider, userAddress: string);
|
|
19
|
-
signAllInputs(
|
|
19
|
+
signAllInputs(psbtHex: string): Promise<string>;
|
|
20
20
|
}
|
|
21
21
|
export {};
|
|
@@ -10,12 +10,12 @@ class ReownWalletAdapter {
|
|
|
10
10
|
this.walletProvider = walletProvider;
|
|
11
11
|
this.userAddress = userAddress;
|
|
12
12
|
}
|
|
13
|
-
async signAllInputs(
|
|
14
|
-
const unsignedTx = btc_signer_1.Transaction.fromPSBT(base_1.
|
|
13
|
+
async signAllInputs(psbtHex) {
|
|
14
|
+
const unsignedTx = btc_signer_1.Transaction.fromPSBT(base_1.hex.decode(psbtHex));
|
|
15
15
|
const inputLength = unsignedTx.inputsLength;
|
|
16
16
|
const inputsToSign = Array.from({ length: inputLength }, (_, i) => i);
|
|
17
17
|
const result = await this.walletProvider.signPSBT({
|
|
18
|
-
psbt:
|
|
18
|
+
psbt: base_1.base64.encode(unsignedTx.toPSBT()),
|
|
19
19
|
broadcast: false,
|
|
20
20
|
signInputs: inputsToSign.map((input) => ({ index: input, address: this.userAddress, sighashTypes: [0] })),
|
|
21
21
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reown.js","sourceRoot":"","sources":["../../../src/gateway/adapters/reown.ts"],"names":[],"mappings":";;;AAAA,kDAAgD;AAEhD,
|
|
1
|
+
{"version":3,"file":"reown.js","sourceRoot":"","sources":["../../../src/gateway/adapters/reown.ts"],"names":[],"mappings":";;;AAAA,kDAAgD;AAEhD,sCAA0C;AAU1C,MAAa,kBAAkB;IAC3B,cAAc,CAAsB;IACpC,WAAW,CAAS;IAEpB,YAAY,cAAmC,EAAE,WAAmB;QAChE,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;IACnC,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,OAAe;QAC/B,MAAM,UAAU,GAAG,wBAAW,CAAC,QAAQ,CAAC,UAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;QAG7D,MAAM,WAAW,GAAG,UAAU,CAAC,YAAY,CAAC;QAC5C,MAAM,YAAY,GAAG,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;QAGtE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC;YAC9C,IAAI,EAAE,aAAM,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;YACxC,SAAS,EAAE,KAAK;YAChB,UAAU,EAAE,YAAY,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,WAAW,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;SAC5G,CAAC,CAAC;QAGH,MAAM,QAAQ,GAAG,wBAAW,CAAC,QAAQ,CAAC,aAAM,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;QAClE,QAAQ,CAAC,QAAQ,EAAE,CAAC;QACpB,OAAO,QAAQ,CAAC,GAAG,CAAC;IACxB,CAAC;CACJ;AA5BD,gDA4BC"}
|
package/dist/gateway/client.js
CHANGED
|
@@ -12,6 +12,7 @@ const base_client_1 = require("./base-client");
|
|
|
12
12
|
const strategy_1 = __importDefault(require("./strategy"));
|
|
13
13
|
const generated_client_1 = require("./generated-client");
|
|
14
14
|
const tokens_1 = require("./tokens");
|
|
15
|
+
const utils_2 = require("./utils");
|
|
15
16
|
exports.WBTC_OFT_ADDRESS = '0x0555E30da8f98308EdB960aa94C0Db47230d2B9c';
|
|
16
17
|
exports.MAINNET_GATEWAY_BASE_URL = 'https://gateway-api-staging.gobob.xyz';
|
|
17
18
|
exports.SIGNET_GATEWAY_BASE_URL = 'https://gateway-api-signet.gobob.xyz';
|
|
@@ -67,7 +68,12 @@ class GatewayApiClient extends base_client_1.BaseClient {
|
|
|
67
68
|
}
|
|
68
69
|
let bitcoinTxHex;
|
|
69
70
|
if (btcSigner.sendBitcoin) {
|
|
70
|
-
bitcoinTxHex =
|
|
71
|
+
bitcoinTxHex = await btcSigner.sendBitcoin({
|
|
72
|
+
from: quote.onramp.sender,
|
|
73
|
+
to: order.onramp.address,
|
|
74
|
+
value: (0, utils_2.formatBtc)(BigInt(quote.onramp.inputAmount.amount)),
|
|
75
|
+
opReturn: order.onramp.opReturnData || undefined,
|
|
76
|
+
});
|
|
71
77
|
}
|
|
72
78
|
else if (btcSigner.signAllInputs) {
|
|
73
79
|
bitcoinTxHex = await btcSigner.signAllInputs(order.onramp.psbt);
|
|
@@ -77,10 +83,14 @@ class GatewayApiClient extends base_client_1.BaseClient {
|
|
|
77
83
|
}
|
|
78
84
|
if (!bitcoinTxHex)
|
|
79
85
|
throw new Error('Failed to get signed transaction');
|
|
80
|
-
const tx = await this.api.registerTx({
|
|
86
|
+
const tx = await this.api.registerTx({
|
|
87
|
+
registerTx: {
|
|
88
|
+
onramp: {
|
|
81
89
|
orderId: order.onramp.orderId,
|
|
82
|
-
bitcoinTx: bitcoinTxHex
|
|
83
|
-
}
|
|
90
|
+
bitcoinTx: bitcoinTxHex,
|
|
91
|
+
},
|
|
92
|
+
},
|
|
93
|
+
}, initOverrides);
|
|
84
94
|
if (typeof tx === 'string') {
|
|
85
95
|
return tx;
|
|
86
96
|
}
|
|
@@ -95,7 +105,11 @@ class GatewayApiClient extends base_client_1.BaseClient {
|
|
|
95
105
|
}
|
|
96
106
|
const accountAddress = walletClient.account.address;
|
|
97
107
|
const tokenAddress = exports.WBTC_OFT_ADDRESS;
|
|
98
|
-
const
|
|
108
|
+
const order = await this.api.createOrder({ gatewayQuote: { offramp: quote.offramp } });
|
|
109
|
+
if (!(0, generated_client_1.instanceOfGatewayCreateOrderOneOf1)(order)) {
|
|
110
|
+
throw new Error('Invalid order type returned from API');
|
|
111
|
+
}
|
|
112
|
+
const spenderAddress = order.offramp.tx.to;
|
|
99
113
|
const [allowance, decimals] = await publicClient.multicall({
|
|
100
114
|
allowFailure: false,
|
|
101
115
|
contracts: [
|
|
@@ -131,11 +145,19 @@ class GatewayApiClient extends base_client_1.BaseClient {
|
|
|
131
145
|
}
|
|
132
146
|
const transactionHash = await walletClient.sendTransaction({
|
|
133
147
|
account: walletClient.account,
|
|
134
|
-
data:
|
|
148
|
+
data: order.offramp.tx.data,
|
|
135
149
|
to: spenderAddress,
|
|
136
|
-
value: BigInt(
|
|
150
|
+
value: BigInt(order.offramp.tx.value || 0),
|
|
137
151
|
});
|
|
138
152
|
await publicClient?.waitForTransactionReceipt({ hash: transactionHash });
|
|
153
|
+
await this.api.registerTx({
|
|
154
|
+
registerTx: {
|
|
155
|
+
offramp: {
|
|
156
|
+
orderId: order.offramp.orderId,
|
|
157
|
+
evmTxhash: transactionHash,
|
|
158
|
+
},
|
|
159
|
+
},
|
|
160
|
+
}, initOverrides);
|
|
139
161
|
return transactionHash;
|
|
140
162
|
}
|
|
141
163
|
else if ((0, generated_client_1.instanceOfGatewayQuoteOneOf2)(quote)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/gateway/client.ts"],"names":[],"mappings":";;;;;;AAAA,+BAUc;AACd,wCAA8C;AAC9C,oCAAkD;AAClD,+BAAuC;AACvC,+CAA2C;AAC3C,0DAAwC;AAGxC,
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/gateway/client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
export interface BitcoinSigner {
|
|
2
|
-
signAllInputs?: (
|
|
2
|
+
signAllInputs?: (psbtHex: string) => Promise<string>;
|
|
3
3
|
sendBitcoin?: (params: {
|
|
4
4
|
from: string;
|
|
5
5
|
to: string;
|
|
6
6
|
value: string;
|
|
7
|
-
opReturn
|
|
8
|
-
isSignet
|
|
7
|
+
opReturn?: string;
|
|
8
|
+
isSignet?: boolean;
|
|
9
9
|
}) => Promise<string>;
|
|
10
10
|
}
|
|
@@ -3,6 +3,6 @@ export declare class ScureBitcoinSigner implements BitcoinSigner {
|
|
|
3
3
|
private privateKey;
|
|
4
4
|
constructor(privateKeyHex: string);
|
|
5
5
|
static fromSeedPhrase(seedPhrase: string, derivationPath: string): Promise<ScureBitcoinSigner>;
|
|
6
|
-
signAllInputs(
|
|
6
|
+
signAllInputs(psbtHex: string): Promise<string>;
|
|
7
7
|
getP2WPKHAddress(): Promise<string>;
|
|
8
8
|
}
|
|
@@ -58,9 +58,9 @@ class ScureBitcoinSigner {
|
|
|
58
58
|
throw new Error(`Failed to create signer from seed phrase: ${error}`);
|
|
59
59
|
}
|
|
60
60
|
}
|
|
61
|
-
async signAllInputs(
|
|
61
|
+
async signAllInputs(psbtHex) {
|
|
62
62
|
try {
|
|
63
|
-
const tx = btc.Transaction.fromPSBT(base_1.
|
|
63
|
+
const tx = btc.Transaction.fromPSBT(base_1.hex.decode(psbtHex));
|
|
64
64
|
for (let i = 0; i < tx.inputsLength; i++) {
|
|
65
65
|
tx.signIdx(this.privateKey, i);
|
|
66
66
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bitcoin-signer.js","sourceRoot":"","sources":["../../../src/gateway/utils/bitcoin-signer.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uDAAyC;AACzC,
|
|
1
|
+
{"version":3,"file":"bitcoin-signer.js","sourceRoot":"","sources":["../../../src/gateway/utils/bitcoin-signer.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uDAAyC;AACzC,sCAA0C;AAC1C,iCAA2C;AAC3C,wCAAqC;AAMrC,MAAa,kBAAkB;IACnB,UAAU,CAAa;IAE/B,YAAY,aAAqB;QAC7B,MAAM,eAAe,GAAG,aAAa,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC;QAChG,IAAI,CAAC,UAAU,GAAG,IAAI,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC,CAAC;IAC1E,CAAC;IAQD,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,UAAkB,EAAE,cAAsB;QAClE,IAAI,CAAC;YACD,MAAM,IAAI,GAAG,IAAA,0BAAkB,EAAC,UAAU,CAAC,CAAC;YAC5C,MAAM,KAAK,GAAG,aAAK,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;YACzC,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;YAC9C,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC;gBACvB,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC;YACrE,CAAC;YACD,OAAO,IAAI,kBAAkB,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;QACpF,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,MAAM,IAAI,KAAK,CAAC,6CAA6C,KAAK,EAAE,CAAC,CAAC;QAC1E,CAAC;IACL,CAAC;IAQD,KAAK,CAAC,aAAa,CAAC,OAAe;QAC/B,IAAI,CAAC;YACD,MAAM,EAAE,GAAG,GAAG,CAAC,WAAW,CAAC,QAAQ,CAAC,UAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;YAGzD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,YAAY,EAAE,CAAC,EAAE,EAAE,CAAC;gBACvC,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;YACnC,CAAC;YAED,EAAE,CAAC,QAAQ,EAAE,CAAC;YAEd,OAAO,EAAE,CAAC,GAAG,CAAC;QAClB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,MAAM,IAAI,KAAK,CAAC,8CAA8C,KAAK,EAAE,CAAC,CAAC;QAC3E,CAAC;IACL,CAAC;IAKD,KAAK,CAAC,gBAAgB;QAClB,OAAO,GAAG,CAAC,UAAU,CAAC,MAAM,EAAE,IAAI,CAAC,UAAU,CAAW,CAAC;IAC7D,CAAC;CACJ;AAzDD,gDAyDC"}
|