@ardrive/turbo-sdk 1.44.1-alpha.2 → 1.44.1-alpha.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/lib/cjs/common/signer.js +1 -2
- package/lib/cjs/utils/common.js +2 -4
- package/lib/cjs/version.js +1 -1
- package/lib/esm/common/signer.js +2 -3
- package/lib/esm/utils/common.js +3 -5
- package/lib/esm/version.js +1 -1
- package/lib/types/common/signer.d.ts.map +1 -1
- package/lib/types/utils/common.d.ts.map +1 -1
- package/lib/types/version.d.ts +1 -1
- package/lib/types/version.d.ts.map +1 -1
- package/package.json +1 -3
package/lib/cjs/common/signer.js
CHANGED
|
@@ -24,7 +24,6 @@ const amino_1 = require("@cosmjs/amino");
|
|
|
24
24
|
const crypto_1 = require("@cosmjs/crypto");
|
|
25
25
|
const encoding_1 = require("@cosmjs/encoding");
|
|
26
26
|
const arbundles_1 = require("@dha-team/arbundles");
|
|
27
|
-
const signing_key_1 = require("@ethersproject/signing-key");
|
|
28
27
|
const web3_js_1 = require("@solana/web3.js");
|
|
29
28
|
const bignumber_js_1 = require("bignumber.js");
|
|
30
29
|
const bs58_1 = __importDefault(require("bs58"));
|
|
@@ -61,7 +60,7 @@ class TurboDataItemAbstractSigner {
|
|
|
61
60
|
case 'usdc':
|
|
62
61
|
case 'base-usdc':
|
|
63
62
|
case 'polygon-usdc':
|
|
64
|
-
return (0, ethers_2.computeAddress)(
|
|
63
|
+
return (0, ethers_2.computeAddress)(ethers_2.SigningKey.computePublicKey((0, base64_js_1.fromB64Url)(owner)));
|
|
65
64
|
case 'kyve':
|
|
66
65
|
return (0, amino_1.pubkeyToAddress)({
|
|
67
66
|
type: 'tendermint/PubKeySecp256k1',
|
package/lib/cjs/utils/common.js
CHANGED
|
@@ -32,8 +32,6 @@ const amino_1 = require("@cosmjs/amino");
|
|
|
32
32
|
const crypto_1 = require("@cosmjs/crypto");
|
|
33
33
|
const encoding_1 = require("@cosmjs/encoding");
|
|
34
34
|
const arbundles_1 = require("@dha-team/arbundles");
|
|
35
|
-
const bytes_1 = require("@ethersproject/bytes");
|
|
36
|
-
const signing_key_1 = require("@ethersproject/signing-key");
|
|
37
35
|
const web3_js_1 = require("@solana/web3.js");
|
|
38
36
|
const ethers_1 = require("ethers");
|
|
39
37
|
const types_js_1 = require("../types.js");
|
|
@@ -81,8 +79,8 @@ function createTurboSigner({ signer: clientProvidedSigner, privateKey: clientPro
|
|
|
81
79
|
const message = 'sign this message to connect to your account';
|
|
82
80
|
const signedMsg = await clientProvidedSigner['signer'].signMessage(message);
|
|
83
81
|
const hash = (0, ethers_1.hashMessage)(message);
|
|
84
|
-
const recoveredKey =
|
|
85
|
-
clientProvidedSigner.publicKey = Buffer.from((0,
|
|
82
|
+
const recoveredKey = ethers_1.SigningKey.recoverPublicKey((0, ethers_1.getBytes)(hash), signedMsg);
|
|
83
|
+
clientProvidedSigner.publicKey = Buffer.from((0, ethers_1.getBytes)(recoveredKey));
|
|
86
84
|
};
|
|
87
85
|
}
|
|
88
86
|
return clientProvidedSigner;
|
package/lib/cjs/version.js
CHANGED
package/lib/esm/common/signer.js
CHANGED
|
@@ -17,13 +17,12 @@ import { pubkeyToAddress } from '@cosmjs/amino';
|
|
|
17
17
|
import { Secp256k1 } from '@cosmjs/crypto';
|
|
18
18
|
import { toBase64 } from '@cosmjs/encoding';
|
|
19
19
|
import { EthereumSigner, HexSolanaSigner, SignatureConfig, } from '@dha-team/arbundles';
|
|
20
|
-
import { computePublicKey } from '@ethersproject/signing-key';
|
|
21
20
|
import { Connection, PublicKey, SystemProgram, Transaction, TransactionInstruction, } from '@solana/web3.js';
|
|
22
21
|
import { BigNumber } from 'bignumber.js';
|
|
23
22
|
import bs58 from 'bs58';
|
|
24
23
|
import { randomBytes } from 'crypto';
|
|
25
24
|
import { Wallet as EthereumWallet, ethers, parseEther } from 'ethers';
|
|
26
|
-
import { computeAddress } from 'ethers';
|
|
25
|
+
import { SigningKey, computeAddress } from 'ethers';
|
|
27
26
|
import nacl from 'tweetnacl';
|
|
28
27
|
import { createWalletClient, custom, http } from 'viem';
|
|
29
28
|
import { privateKeyToAccount } from 'viem/accounts';
|
|
@@ -54,7 +53,7 @@ export class TurboDataItemAbstractSigner {
|
|
|
54
53
|
case 'usdc':
|
|
55
54
|
case 'base-usdc':
|
|
56
55
|
case 'polygon-usdc':
|
|
57
|
-
return computeAddress(computePublicKey(fromB64Url(owner)));
|
|
56
|
+
return computeAddress(SigningKey.computePublicKey(fromB64Url(owner)));
|
|
58
57
|
case 'kyve':
|
|
59
58
|
return pubkeyToAddress({
|
|
60
59
|
type: 'tendermint/PubKeySecp256k1',
|
package/lib/esm/utils/common.js
CHANGED
|
@@ -17,10 +17,8 @@ import { Secp256k1HdWallet, makeCosmoshubPath } from '@cosmjs/amino';
|
|
|
17
17
|
import { Slip10, Slip10Curve } from '@cosmjs/crypto';
|
|
18
18
|
import { toHex } from '@cosmjs/encoding';
|
|
19
19
|
import { ArweaveSigner, EthereumSigner, HexSolanaSigner, InjectedEthereumSigner, } from '@dha-team/arbundles';
|
|
20
|
-
import { arrayify } from '@ethersproject/bytes';
|
|
21
|
-
import { recoverPublicKey } from '@ethersproject/signing-key';
|
|
22
20
|
import { PublicKey } from '@solana/web3.js';
|
|
23
|
-
import { hashMessage } from 'ethers';
|
|
21
|
+
import { SigningKey, getBytes, hashMessage } from 'ethers';
|
|
24
22
|
import { isEthPrivateKey, isJWK, isKyvePrivateKey, tokenTypes, } from '../types.js';
|
|
25
23
|
export function sleep(ms) {
|
|
26
24
|
return new Promise((resolve) => setTimeout(resolve, ms));
|
|
@@ -66,8 +64,8 @@ export function createTurboSigner({ signer: clientProvidedSigner, privateKey: cl
|
|
|
66
64
|
const message = 'sign this message to connect to your account';
|
|
67
65
|
const signedMsg = await clientProvidedSigner['signer'].signMessage(message);
|
|
68
66
|
const hash = hashMessage(message);
|
|
69
|
-
const recoveredKey = recoverPublicKey(
|
|
70
|
-
clientProvidedSigner.publicKey = Buffer.from(
|
|
67
|
+
const recoveredKey = SigningKey.recoverPublicKey(getBytes(hash), signedMsg);
|
|
68
|
+
clientProvidedSigner.publicKey = Buffer.from(getBytes(recoveredKey));
|
|
71
69
|
};
|
|
72
70
|
}
|
|
73
71
|
return clientProvidedSigner;
|
package/lib/esm/version.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signer.d.ts","sourceRoot":"","sources":["../../../src/common/signer.ts"],"names":[],"mappings":"AAuBA,OAAO,EAAE,MAAM,IAAI,cAAc,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"signer.d.ts","sourceRoot":"","sources":["../../../src/common/signer.ts"],"names":[],"mappings":"AAuBA,OAAO,EAAE,MAAM,IAAI,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAiB/D,OAAO,EAAE,MAAM,IAAI,UAAU,EAAE,MAAM,YAAY,CAAC;AAElD,OAAO,EACL,iBAAiB,EACjB,aAAa,EACb,sBAAsB,EACtB,SAAS,EACT,mBAAmB,EACnB,yBAAyB,EACzB,gBAAgB,EAChB,WAAW,EACX,0BAA0B,EAC1B,yBAAyB,EACzB,WAAW,EACX,aAAa,EAGd,MAAM,aAAa,CAAC;AAUrB;;GAEG;AACH,8BAAsB,2BACpB,YAAW,mBAAmB;IAEvB,MAAM,EAAE,WAAW,CAAC;IACpB,aAAa,EAAE,aAAa,GAAG,SAAS,CAAC;IAEhD,SAAS,CAAC,MAAM,EAAE,WAAW,CAAC;IAC9B,SAAS,CAAC,KAAK,EAAE,SAAS,CAAC;gBAEf,EACV,MAAM,EACN,MAAuB,EACvB,KAAK,EACL,aAAa,GACd,EAAE,yBAAyB;IAO5B,QAAQ,CAAC,YAAY,CAAC,EACpB,iBAAiB,EACjB,eAAe,EACf,YAAY,EACZ,OAAO,GACR,EAAE,gBAAgB,CAAC,iBAAiB,CAAC,GAAG,OAAO,CAAC,0BAA0B,CAAC;IAE5E,OAAO,CAAC,oBAAoB;IA6Cf,4BAA4B,CAGvC,KAAK,GAAE,MAAwC,EAM/C,cAAc,CAAC,EAAE,MAAM,GACtB,OAAO,CAAC,yBAAyB,CAAC;IAexB,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC;IAI/B,gBAAgB,IAAI,OAAO,CAAC,aAAa,CAAC;IAOvD,gGAAgG;IACnF,eAAe,CAAC,EAC3B,MAAM,EACN,MAAM,EACN,UAAU,EACV,6BAA6B,GAC9B,EAAE,sBAAsB,GAAG,OAAO,CAAC,MAAM,CAAC;IAuF9B,QAAQ,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;CAgBnE;AAED;;;;;;;;;GASG;AACH,wBAAsB,cAAc,CAClC,eAAe,EAAE,cAAc,GAC9B,OAAO,CAAC,UAAU,CAAC,CAsCrB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../src/utils/common.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../src/utils/common.ts"],"names":[],"mappings":"AA2BA,OAAO,EACL,SAAS,EACT,WAAW,EACX,WAAW,EAKZ,MAAM,aAAa,CAAC;AAErB,wBAAgB,KAAK,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE/C;AAED,wBAAgB,KAAK,YAEpB;AAOD,eAAO,MAAM,oBAAoB,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,CAY1D,CAAC;AAEF,eAAO,MAAM,sBAAsB,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,CAY5D,CAAC;AAEF,wBAAgB,iBAAiB,CAAC,EAChC,MAAM,EAAE,oBAAoB,EAC5B,UAAU,EAAE,wBAAwB,EACpC,KAAiB,GAClB,EAAE;IACD,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,UAAU,CAAC,EAAE,WAAW,CAAC;IACzB,KAAK,EAAE,SAAS,CAAC;CAClB,GAAG,WAAW,CAqDd;AAED,wBAAgB,wBAAwB,CAAC,UAAU,EAAE,MAAM,GAAG,WAAW,CAGxE;AAED,wBAAsB,sBAAsB,CAC1C,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,WAAW,CAAC,CActB;AAED,wBAAgB,MAAM,CAAC,GAAG,EAAE,OAAO,GAAG,GAAG,IAAI,IAAI,CAEhD;AAGD,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,MAAM,WAGxD;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,WAMnD;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,WAGlD;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,WAGjD;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,GAAG,OAAO,CAkB5E;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,KAAK,CAOxE"}
|
package/lib/types/version.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,eAAO,MAAM,OAAO,
|
|
1
|
+
{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,eAAO,MAAM,OAAO,mBAAmB,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ardrive/turbo-sdk",
|
|
3
|
-
"version": "1.44.1-alpha.
|
|
3
|
+
"version": "1.44.1-alpha.3",
|
|
4
4
|
"main": "./lib/cjs/node/index.js",
|
|
5
5
|
"types": "./lib/types/node/index.d.ts",
|
|
6
6
|
"module": "./lib/esm/node/index.js",
|
|
@@ -78,8 +78,6 @@
|
|
|
78
78
|
"@cosmjs/proto-signing": "^0.33.1",
|
|
79
79
|
"@cosmjs/stargate": "^0.33.1",
|
|
80
80
|
"@dha-team/arbundles": "^1.0.1",
|
|
81
|
-
"@ethersproject/signing-key": "^5.7.0",
|
|
82
|
-
"@permaweb/aoconnect": "0.0.57",
|
|
83
81
|
"@solana/spl-token": "^0.4.14",
|
|
84
82
|
"@solana/web3.js": "^1.95.5",
|
|
85
83
|
"arweave": "^1.15.1",
|