@coinflowlabs/react 0.2.9 → 0.2.11
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/README.md +4 -0
- package/build/cjs/CoinflowIFrame.d.ts +5 -4
- package/build/cjs/CoinflowIFrame.js +10 -5
- package/build/cjs/CoinflowIFrame.js.map +1 -1
- package/build/cjs/CoinflowPurchase.js +1 -1
- package/build/cjs/CoinflowPurchase.js.map +1 -1
- package/build/cjs/CoinflowUtils.d.ts +3 -3
- package/build/cjs/CoinflowUtils.js +34 -27
- package/build/cjs/CoinflowUtils.js.map +1 -1
- package/build/cjs/CoinflowWithdraw.js +1 -1
- package/build/cjs/CoinflowWithdraw.js.map +1 -1
- package/build/cjs/IFrameWalletConnector.js +25 -7
- package/build/cjs/IFrameWalletConnector.js.map +1 -1
- package/build/esm/CoinflowIFrame.d.ts +5 -4
- package/build/esm/CoinflowIFrame.js +11 -6
- package/build/esm/CoinflowIFrame.js.map +1 -1
- package/build/esm/CoinflowPurchase.js +1 -1
- package/build/esm/CoinflowPurchase.js.map +1 -1
- package/build/esm/CoinflowUtils.d.ts +3 -3
- package/build/esm/CoinflowUtils.js +35 -28
- package/build/esm/CoinflowUtils.js.map +1 -1
- package/build/esm/CoinflowWithdraw.js +1 -1
- package/build/esm/CoinflowWithdraw.js.map +1 -1
- package/build/esm/IFrameWalletConnector.js +26 -8
- package/build/esm/IFrameWalletConnector.js.map +1 -1
- package/package.json +5 -4
package/README.md
CHANGED
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import { Transaction } from '@solana/web3.js';
|
|
3
|
-
import { CoinflowEnvs } from './CoinflowUtils';
|
|
4
|
-
|
|
5
|
-
|
|
3
|
+
import { CoinflowEnvs, SubsetWalletContextState } from './CoinflowUtils';
|
|
4
|
+
type CoinflowIFrameProps = {
|
|
5
|
+
wallet: SubsetWalletContextState;
|
|
6
6
|
IFrameRef: React.RefObject<HTMLIFrameElement>;
|
|
7
7
|
env?: CoinflowEnvs;
|
|
8
8
|
route: string;
|
|
9
9
|
amount?: number;
|
|
10
10
|
transaction?: Transaction;
|
|
11
11
|
};
|
|
12
|
-
export declare function CoinflowIFrame({
|
|
12
|
+
export declare function CoinflowIFrame({ wallet, IFrameRef, env, route, transaction, amount, }: CoinflowIFrameProps): JSX.Element;
|
|
13
|
+
export {};
|
|
@@ -5,19 +5,24 @@ var tslib_1 = require("tslib");
|
|
|
5
5
|
var react_1 = tslib_1.__importStar(require("react"));
|
|
6
6
|
var CoinflowUtils_1 = require("./CoinflowUtils");
|
|
7
7
|
function CoinflowIFrame(_a) {
|
|
8
|
-
var
|
|
8
|
+
var wallet = _a.wallet, IFrameRef = _a.IFrameRef, env = _a.env, route = _a.route, transaction = _a.transaction, amount = _a.amount;
|
|
9
9
|
var url = (0, react_1.useMemo)(function () {
|
|
10
10
|
return CoinflowUtils_1.CoinflowUtils.getCoinflowUrl({
|
|
11
|
+
wallet: wallet,
|
|
11
12
|
amount: amount,
|
|
12
13
|
env: env,
|
|
13
|
-
publicKey: publicKey,
|
|
14
14
|
route: route,
|
|
15
15
|
transaction: transaction
|
|
16
16
|
});
|
|
17
|
-
}, [amount, env,
|
|
18
|
-
return (0, react_1.useMemo)(function () { return (react_1["default"].createElement("iframe", {
|
|
17
|
+
}, [amount, env, wallet, route, transaction]);
|
|
18
|
+
return (0, react_1.useMemo)(function () { return (react_1["default"].createElement("iframe", { onLoad: function () {
|
|
19
|
+
if (IFrameRef.current)
|
|
20
|
+
IFrameRef.current.style.opacity = '1';
|
|
21
|
+
}, ref: IFrameRef, style: {
|
|
19
22
|
width: '100%',
|
|
20
|
-
height: '100%'
|
|
23
|
+
height: '100%',
|
|
24
|
+
opacity: 0,
|
|
25
|
+
transition: 'opacity 300ms linear'
|
|
21
26
|
}, title: "withdraw", frameBorder: "0", src: url })); }, [IFrameRef, url]);
|
|
22
27
|
}
|
|
23
28
|
exports.CoinflowIFrame = CoinflowIFrame;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CoinflowIFrame.js","sourceRoot":"","sources":["../../src/CoinflowIFrame.tsx"],"names":[],"mappings":";;;;AAAA,qDAAqC;AAErC,
|
|
1
|
+
{"version":3,"file":"CoinflowIFrame.js","sourceRoot":"","sources":["../../src/CoinflowIFrame.tsx"],"names":[],"mappings":";;;;AAAA,qDAAqC;AAErC,iDAIyB;AAWzB,SAAgB,cAAc,CAAC,EAOT;QANpB,MAAM,YAAA,EACN,SAAS,eAAA,EACT,GAAG,SAAA,EACH,KAAK,WAAA,EACL,WAAW,iBAAA,EACX,MAAM,YAAA;IAEN,IAAM,GAAG,GAAG,IAAA,eAAO,EAAC;QAClB,OAAO,6BAAa,CAAC,cAAc,CAAC;YAClC,MAAM,QAAA;YACN,MAAM,QAAA;YACN,GAAG,KAAA;YACH,KAAK,OAAA;YACL,WAAW,aAAA;SACZ,CAAC,CAAC;IACL,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC,CAAC;IAE9C,OAAO,IAAA,eAAO,EACZ,cAAM,OAAA,CACJ,6CACE,MAAM,EAAE;YACN,IAAI,SAAS,CAAC,OAAO;gBAAE,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,GAAG,GAAG,CAAC;QAC/D,CAAC,EACD,GAAG,EAAE,SAAS,EACd,KAAK,EAAE;YACL,KAAK,EAAE,MAAM;YACb,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,CAAC;YACV,UAAU,EAAE,sBAAsB;SACnC,EACD,KAAK,EAAC,UAAU,EAChB,WAAW,EAAC,GAAG,EACf,GAAG,EAAE,GAAG,GACR,CACH,EAhBK,CAgBL,EACD,CAAC,SAAS,EAAE,GAAG,CAAC,CACjB,CAAC;AACJ,CAAC;AAtCD,wCAsCC"}
|
|
@@ -16,7 +16,7 @@ function CoinflowPurchase(_a) {
|
|
|
16
16
|
}).IFrameRef;
|
|
17
17
|
if (!wallet.publicKey || !wallet.connected)
|
|
18
18
|
return null;
|
|
19
|
-
return (react_1["default"].createElement(CoinflowIFrame_1.CoinflowIFrame, {
|
|
19
|
+
return (react_1["default"].createElement(CoinflowIFrame_1.CoinflowIFrame, { wallet: wallet, IFrameRef: IFrameRef, route: "/purchase/".concat(merchantId), env: env, transaction: transaction, amount: amount }));
|
|
20
20
|
}
|
|
21
21
|
exports.CoinflowPurchase = CoinflowPurchase;
|
|
22
22
|
//# sourceMappingURL=CoinflowPurchase.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CoinflowPurchase.js","sourceRoot":"","sources":["../../src/CoinflowPurchase.tsx"],"names":[],"mappings":";;;;AAAA,wDAA0B;AAE1B,mDAAgD;AAGhD,qDAAkD;AAclD,SAAgB,gBAAgB,CAAC,EAUT;QATtB,MAAM,YAAA,EACN,UAAU,gBAAA,EACV,GAAG,SAAA,EACH,UAAU,gBAAA,EACV,SAAS,eAAA,EACT,WAAW,iBAAA,EACX,MAAM,YAAA,EACN,cAAc,oBAAA,EACd,eAAe,EAAf,OAAO,mBAAG,KAAK,KAAA;IAER,IAAA,SAAS,GAAI,IAAA,iCAAe,EAAC;QAClC,MAAM,QAAA;QACN,UAAU,YAAA;QACV,SAAS,WAAA;QACT,cAAc,gBAAA;QACd,OAAO,SAAA;KACR,CAAC,UANc,CAMb;IAEH,IAAI,CAAC,MAAM,CAAC,SAAS,IAAI,CAAC,MAAM,CAAC,SAAS;QAAE,OAAO,IAAI,CAAC;IAExD,OAAO,CACL,iCAAC,+BAAc,IACb,
|
|
1
|
+
{"version":3,"file":"CoinflowPurchase.js","sourceRoot":"","sources":["../../src/CoinflowPurchase.tsx"],"names":[],"mappings":";;;;AAAA,wDAA0B;AAE1B,mDAAgD;AAGhD,qDAAkD;AAclD,SAAgB,gBAAgB,CAAC,EAUT;QATtB,MAAM,YAAA,EACN,UAAU,gBAAA,EACV,GAAG,SAAA,EACH,UAAU,gBAAA,EACV,SAAS,eAAA,EACT,WAAW,iBAAA,EACX,MAAM,YAAA,EACN,cAAc,oBAAA,EACd,eAAe,EAAf,OAAO,mBAAG,KAAK,KAAA;IAER,IAAA,SAAS,GAAI,IAAA,iCAAe,EAAC;QAClC,MAAM,QAAA;QACN,UAAU,YAAA;QACV,SAAS,WAAA;QACT,cAAc,gBAAA;QACd,OAAO,SAAA;KACR,CAAC,UANc,CAMb;IAEH,IAAI,CAAC,MAAM,CAAC,SAAS,IAAI,CAAC,MAAM,CAAC,SAAS;QAAE,OAAO,IAAI,CAAC;IAExD,OAAO,CACL,iCAAC,+BAAc,IACb,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,SAAS,EACpB,KAAK,EAAE,oBAAa,UAAU,CAAE,EAChC,GAAG,EAAE,GAAG,EACR,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,MAAM,GACd,CACH,CAAC;AACJ,CAAC;AA/BD,4CA+BC"}
|
|
@@ -1,16 +1,16 @@
|
|
|
1
1
|
import { Connection, PublicKey, Transaction } from '@solana/web3.js';
|
|
2
2
|
import { WalletContextState } from '@solana/wallet-adapter-react';
|
|
3
3
|
export type CoinflowEnvs = 'prod' | 'staging' | 'sandbox' | 'local';
|
|
4
|
-
export type SubsetWalletContextState = Pick<WalletContextState, 'signTransaction' | 'signMessage' | 'connected' | 'publicKey' | 'sendTransaction'>;
|
|
4
|
+
export type SubsetWalletContextState = Pick<WalletContextState, 'wallet' | 'signTransaction' | 'signMessage' | 'connected' | 'publicKey' | 'sendTransaction'>;
|
|
5
5
|
export declare class CoinflowUtils {
|
|
6
6
|
env: CoinflowEnvs;
|
|
7
7
|
url: string;
|
|
8
8
|
constructor(env?: CoinflowEnvs);
|
|
9
9
|
getFeePayer(): Promise<PublicKey>;
|
|
10
10
|
static getCoinflowBaseUrl(env?: CoinflowEnvs): string;
|
|
11
|
-
static getCoinflowUrl({ route, env, amount,
|
|
11
|
+
static getCoinflowUrl({ wallet, route, env, amount, transaction, }: {
|
|
12
|
+
wallet: SubsetWalletContextState;
|
|
12
13
|
route: string;
|
|
13
|
-
publicKey: string;
|
|
14
14
|
env?: CoinflowEnvs;
|
|
15
15
|
amount?: number;
|
|
16
16
|
transaction?: Transaction;
|
|
@@ -5,6 +5,8 @@ var tslib_1 = require("tslib");
|
|
|
5
5
|
var web3_js_1 = require("@solana/web3.js");
|
|
6
6
|
var spl_token_1 = require("@solana/spl-token");
|
|
7
7
|
var bs58_1 = tslib_1.__importDefault(require("bs58"));
|
|
8
|
+
var buffer_1 = require("buffer");
|
|
9
|
+
var bn_js_1 = tslib_1.__importDefault(require("bn.js"));
|
|
8
10
|
var CoinflowUtils = /** @class */ (function () {
|
|
9
11
|
function CoinflowUtils(env) {
|
|
10
12
|
this.env = env !== null && env !== void 0 ? env : 'prod';
|
|
@@ -38,9 +40,10 @@ var CoinflowUtils = /** @class */ (function () {
|
|
|
38
40
|
return "https://".concat(env, ".coinflow.cash");
|
|
39
41
|
};
|
|
40
42
|
CoinflowUtils.getCoinflowUrl = function (_a) {
|
|
41
|
-
var
|
|
43
|
+
var _b, _c, _d, _e, _f;
|
|
44
|
+
var wallet = _a.wallet, route = _a.route, env = _a.env, amount = _a.amount, transaction = _a.transaction;
|
|
42
45
|
var url = new URL(route, CoinflowUtils.getCoinflowBaseUrl(env));
|
|
43
|
-
url.searchParams.append('pubkey', publicKey);
|
|
46
|
+
url.searchParams.append('pubkey', (_c = (_b = wallet.publicKey) === null || _b === void 0 ? void 0 : _b.toString()) !== null && _c !== void 0 ? _c : '');
|
|
44
47
|
if (transaction) {
|
|
45
48
|
var serializedTx = bs58_1["default"].encode(transaction.serialize({
|
|
46
49
|
requireAllSignatures: false,
|
|
@@ -51,10 +54,30 @@ var CoinflowUtils = /** @class */ (function () {
|
|
|
51
54
|
if (amount) {
|
|
52
55
|
url.searchParams.append('amount', amount.toString());
|
|
53
56
|
}
|
|
57
|
+
var supportsVersionedTransactions = !!((_f = (_e = (_d = wallet.wallet) === null || _d === void 0 ? void 0 : _d.adapter) === null || _e === void 0 ? void 0 : _e.supportedTransactionVersions) === null || _f === void 0 ? void 0 : _f.has(0));
|
|
58
|
+
if (supportsVersionedTransactions) {
|
|
59
|
+
url.searchParams.append('supportsVersionedTransactions', 'true');
|
|
60
|
+
}
|
|
54
61
|
return url.toString();
|
|
55
62
|
};
|
|
56
63
|
CoinflowUtils.prototype.getCoinflowCreditsBalance = function (publicKey, connection) {
|
|
57
64
|
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
65
|
+
function parseTokenAccountAmount(account) {
|
|
66
|
+
try {
|
|
67
|
+
if (!account)
|
|
68
|
+
return 0;
|
|
69
|
+
if (account.data.length !== spl_token_1.ACCOUNT_SIZE)
|
|
70
|
+
return 0;
|
|
71
|
+
var slice = account.data.slice(64, 64 + 8);
|
|
72
|
+
var rawAmount = Number(new bn_js_1["default"](slice.reverse()));
|
|
73
|
+
var uiAmount = rawAmount / Math.pow(10, 6);
|
|
74
|
+
return Number((Math.floor(uiAmount * 100) / 100).toFixed(2));
|
|
75
|
+
}
|
|
76
|
+
catch (e) {
|
|
77
|
+
console.error('Error parsing token account amount', e);
|
|
78
|
+
return 0;
|
|
79
|
+
}
|
|
80
|
+
}
|
|
58
81
|
function getCreditBalance(wallet) {
|
|
59
82
|
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
60
83
|
var ataInfo;
|
|
@@ -63,9 +86,7 @@ var CoinflowUtils = /** @class */ (function () {
|
|
|
63
86
|
case 0: return [4 /*yield*/, getCreditAtaInfo(wallet)];
|
|
64
87
|
case 1:
|
|
65
88
|
ataInfo = _a.sent();
|
|
66
|
-
|
|
67
|
-
return [2 /*return*/, 0];
|
|
68
|
-
return [2 /*return*/, Number(ataInfo.amount) / Math.pow(10, 6)];
|
|
89
|
+
return [2 /*return*/, parseTokenAccountAmount(ataInfo)];
|
|
69
90
|
}
|
|
70
91
|
});
|
|
71
92
|
});
|
|
@@ -76,42 +97,28 @@ var CoinflowUtils = /** @class */ (function () {
|
|
|
76
97
|
return tslib_1.__generator(this, function (_a) {
|
|
77
98
|
switch (_a.label) {
|
|
78
99
|
case 0:
|
|
79
|
-
_a.trys.push([0,
|
|
100
|
+
_a.trys.push([0, 2, , 3]);
|
|
80
101
|
return [4 /*yield*/, getCreditAtaAddress(wallet)];
|
|
81
102
|
case 1:
|
|
82
103
|
ata = _a.sent();
|
|
83
|
-
return [
|
|
84
|
-
case 2:
|
|
85
|
-
case 3:
|
|
104
|
+
return [2 /*return*/, connection.getAccountInfo(ata)];
|
|
105
|
+
case 2:
|
|
86
106
|
e_1 = _a.sent();
|
|
87
|
-
return [2 /*return*/,
|
|
88
|
-
case
|
|
107
|
+
return [2 /*return*/, null];
|
|
108
|
+
case 3: return [2 /*return*/];
|
|
89
109
|
}
|
|
90
110
|
});
|
|
91
111
|
});
|
|
92
112
|
}
|
|
93
113
|
function getCreditAtaAddress(wallet) {
|
|
94
114
|
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
switch (_b.label) {
|
|
98
|
-
case 0:
|
|
99
|
-
_a = spl_token_1.getAssociatedTokenAddress;
|
|
100
|
-
return [4 /*yield*/, creditsMint()];
|
|
101
|
-
case 1: return [2 /*return*/, _a.apply(void 0, [_b.sent(), wallet])];
|
|
102
|
-
}
|
|
115
|
+
return tslib_1.__generator(this, function (_a) {
|
|
116
|
+
return [2 /*return*/, (0, spl_token_1.getAssociatedTokenAddress)(creditsMint(), wallet)];
|
|
103
117
|
});
|
|
104
118
|
});
|
|
105
119
|
}
|
|
106
120
|
function creditsMint() {
|
|
107
|
-
return
|
|
108
|
-
return tslib_1.__generator(this, function (_a) {
|
|
109
|
-
switch (_a.label) {
|
|
110
|
-
case 0: return [4 /*yield*/, web3_js_1.PublicKey.findProgramAddress([Buffer.from('usdc-credits-mint-2')], new web3_js_1.PublicKey('FD1amxhTsDpwzoVX41dxp2ygAESURV2zdUACzxM1Dfw9'))];
|
|
111
|
-
case 1: return [2 /*return*/, (_a.sent())[0]];
|
|
112
|
-
}
|
|
113
|
-
});
|
|
114
|
-
});
|
|
121
|
+
return web3_js_1.PublicKey.findProgramAddressSync([buffer_1.Buffer.from('usdc-credits-mint-2')], new web3_js_1.PublicKey('FD1amxhTsDpwzoVX41dxp2ygAESURV2zdUACzxM1Dfw9'))[0];
|
|
115
122
|
}
|
|
116
123
|
return tslib_1.__generator(this, function (_a) {
|
|
117
124
|
switch (_a.label) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CoinflowUtils.js","sourceRoot":"","sources":["../../src/CoinflowUtils.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"CoinflowUtils.js","sourceRoot":"","sources":["../../src/CoinflowUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,7 @@ function CoinflowWithdraw(_a) {
|
|
|
10
10
|
var IFrameRef = (0, useIframeWallet_1.useIframeWallet)({ wallet: wallet, connection: connection, onSuccess: onSuccess }).IFrameRef;
|
|
11
11
|
if (!wallet.publicKey || !wallet.connected)
|
|
12
12
|
return null;
|
|
13
|
-
return (react_1["default"].createElement(CoinflowIFrame_1.CoinflowIFrame, {
|
|
13
|
+
return (react_1["default"].createElement(CoinflowIFrame_1.CoinflowIFrame, { wallet: wallet, IFrameRef: IFrameRef, route: "/withdraw/".concat(merchantId), env: env }));
|
|
14
14
|
}
|
|
15
15
|
exports.CoinflowWithdraw = CoinflowWithdraw;
|
|
16
16
|
//# sourceMappingURL=CoinflowWithdraw.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CoinflowWithdraw.js","sourceRoot":"","sources":["../../src/CoinflowWithdraw.tsx"],"names":[],"mappings":";;;;AAAA,wDAA0B;AAE1B,mDAAgD;AAGhD,qDAAkD;AAUlD,SAAgB,gBAAgB,CAAC,EAMT;QALtB,MAAM,YAAA,EACN,UAAU,gBAAA,EACV,GAAG,SAAA,EACH,UAAU,gBAAA,EACV,SAAS,eAAA;IAEF,IAAA,SAAS,GAAI,IAAA,iCAAe,EAAC,EAAC,MAAM,QAAA,EAAE,UAAU,YAAA,EAAE,SAAS,WAAA,EAAC,CAAC,UAApD,CAAqD;IAErE,IAAI,CAAC,MAAM,CAAC,SAAS,IAAI,CAAC,MAAM,CAAC,SAAS;QAAE,OAAO,IAAI,CAAC;IAExD,OAAO,CACL,iCAAC,+BAAc,IACb,
|
|
1
|
+
{"version":3,"file":"CoinflowWithdraw.js","sourceRoot":"","sources":["../../src/CoinflowWithdraw.tsx"],"names":[],"mappings":";;;;AAAA,wDAA0B;AAE1B,mDAAgD;AAGhD,qDAAkD;AAUlD,SAAgB,gBAAgB,CAAC,EAMT;QALtB,MAAM,YAAA,EACN,UAAU,gBAAA,EACV,GAAG,SAAA,EACH,UAAU,gBAAA,EACV,SAAS,eAAA;IAEF,IAAA,SAAS,GAAI,IAAA,iCAAe,EAAC,EAAC,MAAM,QAAA,EAAE,UAAU,YAAA,EAAE,SAAS,WAAA,EAAC,CAAC,UAApD,CAAqD;IAErE,IAAI,CAAC,MAAM,CAAC,SAAS,IAAI,CAAC,MAAM,CAAC,SAAS;QAAE,OAAO,IAAI,CAAC;IAExD,OAAO,CACL,iCAAC,+BAAc,IACb,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,SAAS,EACpB,KAAK,EAAE,oBAAa,UAAU,CAAE,EAChC,GAAG,EAAE,GAAG,GACR,CACH,CAAC;AACJ,CAAC;AAnBD,4CAmBC"}
|
|
@@ -50,18 +50,35 @@ function useHandleIFrameMessages(_a) {
|
|
|
50
50
|
var handleSendTransaction = (0, react_1.useCallback)(function (_a) {
|
|
51
51
|
var data = _a.data;
|
|
52
52
|
return tslib_1.__awaiter(_this, void 0, void 0, function () {
|
|
53
|
+
function getTransaction() {
|
|
54
|
+
var parsedUInt8Array = bs58_1["default"].decode(data);
|
|
55
|
+
var vtx = web3_js_1.VersionedTransaction.deserialize(parsedUInt8Array);
|
|
56
|
+
if (vtx.version === 'legacy')
|
|
57
|
+
return web3_js_1.Transaction.from(parsedUInt8Array);
|
|
58
|
+
return vtx;
|
|
59
|
+
}
|
|
53
60
|
var tx, partiallySign, signature;
|
|
54
61
|
return tslib_1.__generator(this, function (_b) {
|
|
55
62
|
switch (_b.label) {
|
|
56
63
|
case 0:
|
|
57
|
-
tx =
|
|
64
|
+
tx = getTransaction();
|
|
58
65
|
partiallySign = function (signer) {
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
66
|
+
if (tx instanceof web3_js_1.Transaction) {
|
|
67
|
+
var requiredSignatures = tx.signatures.map(function (sig) {
|
|
68
|
+
return sig.publicKey.toString();
|
|
69
|
+
});
|
|
70
|
+
var shouldSign_1 = requiredSignatures.includes(signer.publicKey.toString());
|
|
71
|
+
if (shouldSign_1)
|
|
72
|
+
tx.partialSign(signer);
|
|
73
|
+
return;
|
|
74
|
+
}
|
|
75
|
+
var signerPubkeys = tx.message.staticAccountKeys
|
|
76
|
+
.slice(0, tx.message.header.numRequiredSignatures)
|
|
77
|
+
.map(function (pk) { return pk.toString(); });
|
|
78
|
+
var shouldSign = signerPubkeys.includes(signer.publicKey.toString());
|
|
63
79
|
if (shouldSign)
|
|
64
|
-
tx.
|
|
80
|
+
tx.sign([signer]);
|
|
81
|
+
return;
|
|
65
82
|
};
|
|
66
83
|
if (partialSigners) {
|
|
67
84
|
partialSigners.forEach(partiallySign);
|
|
@@ -177,11 +194,12 @@ function useHandleIFrameMessages(_a) {
|
|
|
177
194
|
});
|
|
178
195
|
});
|
|
179
196
|
}, [
|
|
197
|
+
wallet,
|
|
180
198
|
handleSignMessage,
|
|
181
199
|
handleSendTransaction,
|
|
182
200
|
onSuccess,
|
|
201
|
+
handleSignTransaction,
|
|
183
202
|
sendIFrameMessage,
|
|
184
|
-
wallet,
|
|
185
203
|
]);
|
|
186
204
|
return { handleIframeMessages: handleIframeMessages };
|
|
187
205
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"IFrameWalletConnector.js","sourceRoot":"","sources":["../../src/IFrameWalletConnector.ts"],"names":[],"mappings":";;;;AAAA,+BAAkC;AAClC,sDAA0B;AAC1B,
|
|
1
|
+
{"version":3,"file":"IFrameWalletConnector.js","sourceRoot":"","sources":["../../src/IFrameWalletConnector.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import { Transaction } from '@solana/web3.js';
|
|
3
|
-
import { CoinflowEnvs } from './CoinflowUtils';
|
|
4
|
-
|
|
5
|
-
|
|
3
|
+
import { CoinflowEnvs, SubsetWalletContextState } from './CoinflowUtils';
|
|
4
|
+
type CoinflowIFrameProps = {
|
|
5
|
+
wallet: SubsetWalletContextState;
|
|
6
6
|
IFrameRef: React.RefObject<HTMLIFrameElement>;
|
|
7
7
|
env?: CoinflowEnvs;
|
|
8
8
|
route: string;
|
|
9
9
|
amount?: number;
|
|
10
10
|
transaction?: Transaction;
|
|
11
11
|
};
|
|
12
|
-
export declare function CoinflowIFrame({
|
|
12
|
+
export declare function CoinflowIFrame({ wallet, IFrameRef, env, route, transaction, amount, }: CoinflowIFrameProps): JSX.Element;
|
|
13
|
+
export {};
|
|
@@ -1,19 +1,24 @@
|
|
|
1
1
|
import React, { useMemo } from 'react';
|
|
2
|
-
import { CoinflowUtils } from './CoinflowUtils';
|
|
2
|
+
import { CoinflowUtils, } from './CoinflowUtils';
|
|
3
3
|
export function CoinflowIFrame(_a) {
|
|
4
|
-
var
|
|
4
|
+
var wallet = _a.wallet, IFrameRef = _a.IFrameRef, env = _a.env, route = _a.route, transaction = _a.transaction, amount = _a.amount;
|
|
5
5
|
var url = useMemo(function () {
|
|
6
6
|
return CoinflowUtils.getCoinflowUrl({
|
|
7
|
+
wallet: wallet,
|
|
7
8
|
amount: amount,
|
|
8
9
|
env: env,
|
|
9
|
-
publicKey: publicKey,
|
|
10
10
|
route: route,
|
|
11
11
|
transaction: transaction
|
|
12
12
|
});
|
|
13
|
-
}, [amount, env,
|
|
14
|
-
return useMemo(function () { return (React.createElement("iframe", {
|
|
13
|
+
}, [amount, env, wallet, route, transaction]);
|
|
14
|
+
return useMemo(function () { return (React.createElement("iframe", { onLoad: function () {
|
|
15
|
+
if (IFrameRef.current)
|
|
16
|
+
IFrameRef.current.style.opacity = '1';
|
|
17
|
+
}, ref: IFrameRef, style: {
|
|
15
18
|
width: '100%',
|
|
16
|
-
height: '100%'
|
|
19
|
+
height: '100%',
|
|
20
|
+
opacity: 0,
|
|
21
|
+
transition: 'opacity 300ms linear'
|
|
17
22
|
}, title: "withdraw", frameBorder: "0", src: url })); }, [IFrameRef, url]);
|
|
18
23
|
}
|
|
19
24
|
//# sourceMappingURL=CoinflowIFrame.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CoinflowIFrame.js","sourceRoot":"","sources":["../../src/CoinflowIFrame.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAC,OAAO,EAAC,MAAM,OAAO,CAAC;AAErC,OAAO,
|
|
1
|
+
{"version":3,"file":"CoinflowIFrame.js","sourceRoot":"","sources":["../../src/CoinflowIFrame.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAC,OAAO,EAAC,MAAM,OAAO,CAAC;AAErC,OAAO,EAEL,aAAa,GAEd,MAAM,iBAAiB,CAAC;AAWzB,MAAM,UAAU,cAAc,CAAC,EAOT;QANpB,MAAM,YAAA,EACN,SAAS,eAAA,EACT,GAAG,SAAA,EACH,KAAK,WAAA,EACL,WAAW,iBAAA,EACX,MAAM,YAAA;IAEN,IAAM,GAAG,GAAG,OAAO,CAAC;QAClB,OAAO,aAAa,CAAC,cAAc,CAAC;YAClC,MAAM,QAAA;YACN,MAAM,QAAA;YACN,GAAG,KAAA;YACH,KAAK,OAAA;YACL,WAAW,aAAA;SACZ,CAAC,CAAC;IACL,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC,CAAC;IAE9C,OAAO,OAAO,CACZ,cAAM,OAAA,CACJ,gCACE,MAAM,EAAE;YACN,IAAI,SAAS,CAAC,OAAO;gBAAE,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,GAAG,GAAG,CAAC;QAC/D,CAAC,EACD,GAAG,EAAE,SAAS,EACd,KAAK,EAAE;YACL,KAAK,EAAE,MAAM;YACb,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,CAAC;YACV,UAAU,EAAE,sBAAsB;SACnC,EACD,KAAK,EAAC,UAAU,EAChB,WAAW,EAAC,GAAG,EACf,GAAG,EAAE,GAAG,GACR,CACH,EAhBK,CAgBL,EACD,CAAC,SAAS,EAAE,GAAG,CAAC,CACjB,CAAC;AACJ,CAAC"}
|
|
@@ -12,6 +12,6 @@ export function CoinflowPurchase(_a) {
|
|
|
12
12
|
}).IFrameRef;
|
|
13
13
|
if (!wallet.publicKey || !wallet.connected)
|
|
14
14
|
return null;
|
|
15
|
-
return (React.createElement(CoinflowIFrame, {
|
|
15
|
+
return (React.createElement(CoinflowIFrame, { wallet: wallet, IFrameRef: IFrameRef, route: "/purchase/".concat(merchantId), env: env, transaction: transaction, amount: amount }));
|
|
16
16
|
}
|
|
17
17
|
//# sourceMappingURL=CoinflowPurchase.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CoinflowPurchase.js","sourceRoot":"","sources":["../../src/CoinflowPurchase.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAC,cAAc,EAAC,MAAM,kBAAkB,CAAC;AAGhD,OAAO,EAAC,eAAe,EAAC,MAAM,mBAAmB,CAAC;AAclD,MAAM,UAAU,gBAAgB,CAAC,EAUT;QATtB,MAAM,YAAA,EACN,UAAU,gBAAA,EACV,GAAG,SAAA,EACH,UAAU,gBAAA,EACV,SAAS,eAAA,EACT,WAAW,iBAAA,EACX,MAAM,YAAA,EACN,cAAc,oBAAA,EACd,eAAe,EAAf,OAAO,mBAAG,KAAK,KAAA;IAER,IAAA,SAAS,GAAI,eAAe,CAAC;QAClC,MAAM,QAAA;QACN,UAAU,YAAA;QACV,SAAS,WAAA;QACT,cAAc,gBAAA;QACd,OAAO,SAAA;KACR,CAAC,UANc,CAMb;IAEH,IAAI,CAAC,MAAM,CAAC,SAAS,IAAI,CAAC,MAAM,CAAC,SAAS;QAAE,OAAO,IAAI,CAAC;IAExD,OAAO,CACL,oBAAC,cAAc,IACb,
|
|
1
|
+
{"version":3,"file":"CoinflowPurchase.js","sourceRoot":"","sources":["../../src/CoinflowPurchase.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAC,cAAc,EAAC,MAAM,kBAAkB,CAAC;AAGhD,OAAO,EAAC,eAAe,EAAC,MAAM,mBAAmB,CAAC;AAclD,MAAM,UAAU,gBAAgB,CAAC,EAUT;QATtB,MAAM,YAAA,EACN,UAAU,gBAAA,EACV,GAAG,SAAA,EACH,UAAU,gBAAA,EACV,SAAS,eAAA,EACT,WAAW,iBAAA,EACX,MAAM,YAAA,EACN,cAAc,oBAAA,EACd,eAAe,EAAf,OAAO,mBAAG,KAAK,KAAA;IAER,IAAA,SAAS,GAAI,eAAe,CAAC;QAClC,MAAM,QAAA;QACN,UAAU,YAAA;QACV,SAAS,WAAA;QACT,cAAc,gBAAA;QACd,OAAO,SAAA;KACR,CAAC,UANc,CAMb;IAEH,IAAI,CAAC,MAAM,CAAC,SAAS,IAAI,CAAC,MAAM,CAAC,SAAS;QAAE,OAAO,IAAI,CAAC;IAExD,OAAO,CACL,oBAAC,cAAc,IACb,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,SAAS,EACpB,KAAK,EAAE,oBAAa,UAAU,CAAE,EAChC,GAAG,EAAE,GAAG,EACR,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,MAAM,GACd,CACH,CAAC;AACJ,CAAC"}
|
|
@@ -1,16 +1,16 @@
|
|
|
1
1
|
import { Connection, PublicKey, Transaction } from '@solana/web3.js';
|
|
2
2
|
import { WalletContextState } from '@solana/wallet-adapter-react';
|
|
3
3
|
export type CoinflowEnvs = 'prod' | 'staging' | 'sandbox' | 'local';
|
|
4
|
-
export type SubsetWalletContextState = Pick<WalletContextState, 'signTransaction' | 'signMessage' | 'connected' | 'publicKey' | 'sendTransaction'>;
|
|
4
|
+
export type SubsetWalletContextState = Pick<WalletContextState, 'wallet' | 'signTransaction' | 'signMessage' | 'connected' | 'publicKey' | 'sendTransaction'>;
|
|
5
5
|
export declare class CoinflowUtils {
|
|
6
6
|
env: CoinflowEnvs;
|
|
7
7
|
url: string;
|
|
8
8
|
constructor(env?: CoinflowEnvs);
|
|
9
9
|
getFeePayer(): Promise<PublicKey>;
|
|
10
10
|
static getCoinflowBaseUrl(env?: CoinflowEnvs): string;
|
|
11
|
-
static getCoinflowUrl({ route, env, amount,
|
|
11
|
+
static getCoinflowUrl({ wallet, route, env, amount, transaction, }: {
|
|
12
|
+
wallet: SubsetWalletContextState;
|
|
12
13
|
route: string;
|
|
13
|
-
publicKey: string;
|
|
14
14
|
env?: CoinflowEnvs;
|
|
15
15
|
amount?: number;
|
|
16
16
|
transaction?: Transaction;
|
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
import { __awaiter, __generator } from "tslib";
|
|
2
2
|
import { PublicKey } from '@solana/web3.js';
|
|
3
|
-
import {
|
|
3
|
+
import { ACCOUNT_SIZE, getAssociatedTokenAddress } from '@solana/spl-token';
|
|
4
4
|
import base58 from 'bs58';
|
|
5
|
+
import { Buffer } from 'buffer';
|
|
6
|
+
import BN from 'bn.js';
|
|
5
7
|
var CoinflowUtils = /** @class */ (function () {
|
|
6
8
|
function CoinflowUtils(env) {
|
|
7
9
|
this.env = env !== null && env !== void 0 ? env : 'prod';
|
|
@@ -35,9 +37,10 @@ var CoinflowUtils = /** @class */ (function () {
|
|
|
35
37
|
return "https://".concat(env, ".coinflow.cash");
|
|
36
38
|
};
|
|
37
39
|
CoinflowUtils.getCoinflowUrl = function (_a) {
|
|
38
|
-
var
|
|
40
|
+
var _b, _c, _d, _e, _f;
|
|
41
|
+
var wallet = _a.wallet, route = _a.route, env = _a.env, amount = _a.amount, transaction = _a.transaction;
|
|
39
42
|
var url = new URL(route, CoinflowUtils.getCoinflowBaseUrl(env));
|
|
40
|
-
url.searchParams.append('pubkey', publicKey);
|
|
43
|
+
url.searchParams.append('pubkey', (_c = (_b = wallet.publicKey) === null || _b === void 0 ? void 0 : _b.toString()) !== null && _c !== void 0 ? _c : '');
|
|
41
44
|
if (transaction) {
|
|
42
45
|
var serializedTx = base58.encode(transaction.serialize({
|
|
43
46
|
requireAllSignatures: false,
|
|
@@ -48,10 +51,30 @@ var CoinflowUtils = /** @class */ (function () {
|
|
|
48
51
|
if (amount) {
|
|
49
52
|
url.searchParams.append('amount', amount.toString());
|
|
50
53
|
}
|
|
54
|
+
var supportsVersionedTransactions = !!((_f = (_e = (_d = wallet.wallet) === null || _d === void 0 ? void 0 : _d.adapter) === null || _e === void 0 ? void 0 : _e.supportedTransactionVersions) === null || _f === void 0 ? void 0 : _f.has(0));
|
|
55
|
+
if (supportsVersionedTransactions) {
|
|
56
|
+
url.searchParams.append('supportsVersionedTransactions', 'true');
|
|
57
|
+
}
|
|
51
58
|
return url.toString();
|
|
52
59
|
};
|
|
53
60
|
CoinflowUtils.prototype.getCoinflowCreditsBalance = function (publicKey, connection) {
|
|
54
61
|
return __awaiter(this, void 0, void 0, function () {
|
|
62
|
+
function parseTokenAccountAmount(account) {
|
|
63
|
+
try {
|
|
64
|
+
if (!account)
|
|
65
|
+
return 0;
|
|
66
|
+
if (account.data.length !== ACCOUNT_SIZE)
|
|
67
|
+
return 0;
|
|
68
|
+
var slice = account.data.slice(64, 64 + 8);
|
|
69
|
+
var rawAmount = Number(new BN(slice.reverse()));
|
|
70
|
+
var uiAmount = rawAmount / Math.pow(10, 6);
|
|
71
|
+
return Number((Math.floor(uiAmount * 100) / 100).toFixed(2));
|
|
72
|
+
}
|
|
73
|
+
catch (e) {
|
|
74
|
+
console.error('Error parsing token account amount', e);
|
|
75
|
+
return 0;
|
|
76
|
+
}
|
|
77
|
+
}
|
|
55
78
|
function getCreditBalance(wallet) {
|
|
56
79
|
return __awaiter(this, void 0, void 0, function () {
|
|
57
80
|
var ataInfo;
|
|
@@ -60,9 +83,7 @@ var CoinflowUtils = /** @class */ (function () {
|
|
|
60
83
|
case 0: return [4 /*yield*/, getCreditAtaInfo(wallet)];
|
|
61
84
|
case 1:
|
|
62
85
|
ataInfo = _a.sent();
|
|
63
|
-
|
|
64
|
-
return [2 /*return*/, 0];
|
|
65
|
-
return [2 /*return*/, Number(ataInfo.amount) / Math.pow(10, 6)];
|
|
86
|
+
return [2 /*return*/, parseTokenAccountAmount(ataInfo)];
|
|
66
87
|
}
|
|
67
88
|
});
|
|
68
89
|
});
|
|
@@ -73,42 +94,28 @@ var CoinflowUtils = /** @class */ (function () {
|
|
|
73
94
|
return __generator(this, function (_a) {
|
|
74
95
|
switch (_a.label) {
|
|
75
96
|
case 0:
|
|
76
|
-
_a.trys.push([0,
|
|
97
|
+
_a.trys.push([0, 2, , 3]);
|
|
77
98
|
return [4 /*yield*/, getCreditAtaAddress(wallet)];
|
|
78
99
|
case 1:
|
|
79
100
|
ata = _a.sent();
|
|
80
|
-
return [
|
|
81
|
-
case 2:
|
|
82
|
-
case 3:
|
|
101
|
+
return [2 /*return*/, connection.getAccountInfo(ata)];
|
|
102
|
+
case 2:
|
|
83
103
|
e_1 = _a.sent();
|
|
84
|
-
return [2 /*return*/,
|
|
85
|
-
case
|
|
104
|
+
return [2 /*return*/, null];
|
|
105
|
+
case 3: return [2 /*return*/];
|
|
86
106
|
}
|
|
87
107
|
});
|
|
88
108
|
});
|
|
89
109
|
}
|
|
90
110
|
function getCreditAtaAddress(wallet) {
|
|
91
111
|
return __awaiter(this, void 0, void 0, function () {
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
switch (_b.label) {
|
|
95
|
-
case 0:
|
|
96
|
-
_a = getAssociatedTokenAddress;
|
|
97
|
-
return [4 /*yield*/, creditsMint()];
|
|
98
|
-
case 1: return [2 /*return*/, _a.apply(void 0, [_b.sent(), wallet])];
|
|
99
|
-
}
|
|
112
|
+
return __generator(this, function (_a) {
|
|
113
|
+
return [2 /*return*/, getAssociatedTokenAddress(creditsMint(), wallet)];
|
|
100
114
|
});
|
|
101
115
|
});
|
|
102
116
|
}
|
|
103
117
|
function creditsMint() {
|
|
104
|
-
return
|
|
105
|
-
return __generator(this, function (_a) {
|
|
106
|
-
switch (_a.label) {
|
|
107
|
-
case 0: return [4 /*yield*/, PublicKey.findProgramAddress([Buffer.from('usdc-credits-mint-2')], new PublicKey('FD1amxhTsDpwzoVX41dxp2ygAESURV2zdUACzxM1Dfw9'))];
|
|
108
|
-
case 1: return [2 /*return*/, (_a.sent())[0]];
|
|
109
|
-
}
|
|
110
|
-
});
|
|
111
|
-
});
|
|
118
|
+
return PublicKey.findProgramAddressSync([Buffer.from('usdc-credits-mint-2')], new PublicKey('FD1amxhTsDpwzoVX41dxp2ygAESURV2zdUACzxM1Dfw9'))[0];
|
|
112
119
|
}
|
|
113
120
|
return __generator(this, function (_a) {
|
|
114
121
|
switch (_a.label) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CoinflowUtils.js","sourceRoot":"","sources":["../../src/CoinflowUtils.ts"],"names":[],"mappings":";AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"CoinflowUtils.js","sourceRoot":"","sources":["../../src/CoinflowUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,6 @@ export function CoinflowWithdraw(_a) {
|
|
|
6
6
|
var IFrameRef = useIframeWallet({ wallet: wallet, connection: connection, onSuccess: onSuccess }).IFrameRef;
|
|
7
7
|
if (!wallet.publicKey || !wallet.connected)
|
|
8
8
|
return null;
|
|
9
|
-
return (React.createElement(CoinflowIFrame, {
|
|
9
|
+
return (React.createElement(CoinflowIFrame, { wallet: wallet, IFrameRef: IFrameRef, route: "/withdraw/".concat(merchantId), env: env }));
|
|
10
10
|
}
|
|
11
11
|
//# sourceMappingURL=CoinflowWithdraw.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CoinflowWithdraw.js","sourceRoot":"","sources":["../../src/CoinflowWithdraw.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAC,cAAc,EAAC,MAAM,kBAAkB,CAAC;AAGhD,OAAO,EAAC,eAAe,EAAC,MAAM,mBAAmB,CAAC;AAUlD,MAAM,UAAU,gBAAgB,CAAC,EAMT;QALtB,MAAM,YAAA,EACN,UAAU,gBAAA,EACV,GAAG,SAAA,EACH,UAAU,gBAAA,EACV,SAAS,eAAA;IAEF,IAAA,SAAS,GAAI,eAAe,CAAC,EAAC,MAAM,QAAA,EAAE,UAAU,YAAA,EAAE,SAAS,WAAA,EAAC,CAAC,UAApD,CAAqD;IAErE,IAAI,CAAC,MAAM,CAAC,SAAS,IAAI,CAAC,MAAM,CAAC,SAAS;QAAE,OAAO,IAAI,CAAC;IAExD,OAAO,CACL,oBAAC,cAAc,IACb,
|
|
1
|
+
{"version":3,"file":"CoinflowWithdraw.js","sourceRoot":"","sources":["../../src/CoinflowWithdraw.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAC,cAAc,EAAC,MAAM,kBAAkB,CAAC;AAGhD,OAAO,EAAC,eAAe,EAAC,MAAM,mBAAmB,CAAC;AAUlD,MAAM,UAAU,gBAAgB,CAAC,EAMT;QALtB,MAAM,YAAA,EACN,UAAU,gBAAA,EACV,GAAG,SAAA,EACH,UAAU,gBAAA,EACV,SAAS,eAAA;IAEF,IAAA,SAAS,GAAI,eAAe,CAAC,EAAC,MAAM,QAAA,EAAE,UAAU,YAAA,EAAE,SAAS,WAAA,EAAC,CAAC,UAApD,CAAqD;IAErE,IAAI,CAAC,MAAM,CAAC,SAAS,IAAI,CAAC,MAAM,CAAC,SAAS;QAAE,OAAO,IAAI,CAAC;IAExD,OAAO,CACL,oBAAC,cAAc,IACb,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,SAAS,EACpB,KAAK,EAAE,oBAAa,UAAU,CAAE,EAChC,GAAG,EAAE,GAAG,GACR,CACH,CAAC;AACJ,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { __awaiter, __generator } from "tslib";
|
|
2
2
|
import { useCallback } from 'react';
|
|
3
3
|
import base58 from 'bs58';
|
|
4
|
-
import { Transaction } from '@solana/web3.js';
|
|
4
|
+
import { Transaction, VersionedTransaction, } from '@solana/web3.js';
|
|
5
5
|
export function useHandleIFrameMessages(_a) {
|
|
6
6
|
var _this = this;
|
|
7
7
|
var wallet = _a.wallet, connection = _a.connection, onSuccess = _a.onSuccess, partialSigners = _a.partialSigners, _b = _a.debugTx, debugTx = _b === void 0 ? false : _b, sendIFrameMessage = _a.sendIFrameMessage;
|
|
@@ -47,18 +47,35 @@ export function useHandleIFrameMessages(_a) {
|
|
|
47
47
|
var handleSendTransaction = useCallback(function (_a) {
|
|
48
48
|
var data = _a.data;
|
|
49
49
|
return __awaiter(_this, void 0, void 0, function () {
|
|
50
|
+
function getTransaction() {
|
|
51
|
+
var parsedUInt8Array = base58.decode(data);
|
|
52
|
+
var vtx = VersionedTransaction.deserialize(parsedUInt8Array);
|
|
53
|
+
if (vtx.version === 'legacy')
|
|
54
|
+
return Transaction.from(parsedUInt8Array);
|
|
55
|
+
return vtx;
|
|
56
|
+
}
|
|
50
57
|
var tx, partiallySign, signature;
|
|
51
58
|
return __generator(this, function (_b) {
|
|
52
59
|
switch (_b.label) {
|
|
53
60
|
case 0:
|
|
54
|
-
tx =
|
|
61
|
+
tx = getTransaction();
|
|
55
62
|
partiallySign = function (signer) {
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
63
|
+
if (tx instanceof Transaction) {
|
|
64
|
+
var requiredSignatures = tx.signatures.map(function (sig) {
|
|
65
|
+
return sig.publicKey.toString();
|
|
66
|
+
});
|
|
67
|
+
var shouldSign_1 = requiredSignatures.includes(signer.publicKey.toString());
|
|
68
|
+
if (shouldSign_1)
|
|
69
|
+
tx.partialSign(signer);
|
|
70
|
+
return;
|
|
71
|
+
}
|
|
72
|
+
var signerPubkeys = tx.message.staticAccountKeys
|
|
73
|
+
.slice(0, tx.message.header.numRequiredSignatures)
|
|
74
|
+
.map(function (pk) { return pk.toString(); });
|
|
75
|
+
var shouldSign = signerPubkeys.includes(signer.publicKey.toString());
|
|
60
76
|
if (shouldSign)
|
|
61
|
-
tx.
|
|
77
|
+
tx.sign([signer]);
|
|
78
|
+
return;
|
|
62
79
|
};
|
|
63
80
|
if (partialSigners) {
|
|
64
81
|
partialSigners.forEach(partiallySign);
|
|
@@ -174,11 +191,12 @@ export function useHandleIFrameMessages(_a) {
|
|
|
174
191
|
});
|
|
175
192
|
});
|
|
176
193
|
}, [
|
|
194
|
+
wallet,
|
|
177
195
|
handleSignMessage,
|
|
178
196
|
handleSendTransaction,
|
|
179
197
|
onSuccess,
|
|
198
|
+
handleSignTransaction,
|
|
180
199
|
sendIFrameMessage,
|
|
181
|
-
wallet,
|
|
182
200
|
]);
|
|
183
201
|
return { handleIframeMessages: handleIframeMessages };
|
|
184
202
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"IFrameWalletConnector.js","sourceRoot":"","sources":["../../src/IFrameWalletConnector.ts"],"names":[],"mappings":";AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,OAAO,CAAC;AAClC,OAAO,MAAM,MAAM,MAAM,CAAC;AAC1B,OAAO,
|
|
1
|
+
{"version":3,"file":"IFrameWalletConnector.js","sourceRoot":"","sources":["../../src/IFrameWalletConnector.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@coinflowlabs/react",
|
|
3
|
-
"version": "0.2.
|
|
3
|
+
"version": "0.2.11",
|
|
4
4
|
"description": "React Component for Coinflow Withdraw",
|
|
5
5
|
"main": "./build/cjs/index.js",
|
|
6
6
|
"module": "./build/esm/index.js",
|
|
@@ -24,15 +24,16 @@
|
|
|
24
24
|
],
|
|
25
25
|
"dependencies": {
|
|
26
26
|
"bs58": "^5.0.0",
|
|
27
|
-
"@solana/web3.js": "^1.70.
|
|
28
|
-
"@solana/spl-token": "^0.3.6"
|
|
27
|
+
"@solana/web3.js": "^1.70.1",
|
|
28
|
+
"@solana/spl-token": "^0.3.6",
|
|
29
|
+
"bn.js": "^5.2.1"
|
|
29
30
|
},
|
|
30
31
|
"devDependencies": {
|
|
31
32
|
"@types/react": "^18.0.26",
|
|
32
33
|
"eslint-config-react-app": "^7.0.1",
|
|
33
34
|
"react": "^18.2.0",
|
|
34
35
|
"react-dom": "^18.2.0",
|
|
35
|
-
"typescript": "^4.9.
|
|
36
|
+
"typescript": "^4.9.4"
|
|
36
37
|
},
|
|
37
38
|
"peerDependencies": {
|
|
38
39
|
"react": ">=16"
|