@silvana-one/mina-utils 1.2.0 → 1.2.2
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/node/index.cjs +3 -3
- package/dist/node/transactions/nonce.js +2 -1
- package/dist/node/transactions/nonce.js.map +1 -1
- package/dist/node/utils/mina.d.ts +2 -1
- package/dist/node/utils/mina.js +2 -2
- package/dist/node/utils/mina.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/tsconfig.web.tsbuildinfo +1 -1
- package/dist/web/transactions/nonce.js +2 -1
- package/dist/web/transactions/nonce.js.map +1 -1
- package/dist/web/utils/mina.d.ts +2 -1
- package/dist/web/utils/mina.js +2 -2
- package/dist/web/utils/mina.js.map +1 -1
- package/package.json +3 -3
- package/src/transactions/nonce.ts +2 -1
- package/src/utils/mina.ts +5 -2
package/dist/web/utils/mina.js
CHANGED
|
@@ -31,7 +31,7 @@ function getDeployer() {
|
|
|
31
31
|
* @returns the Mina network instance
|
|
32
32
|
*/
|
|
33
33
|
async function initBlockchain(params) {
|
|
34
|
-
const { chain, deployersNumber = 0, proofsEnabled = true, customMinaNodeUrl = undefined, customMinaArchiveNodeUrl = undefined, } = params;
|
|
34
|
+
const { chain, deployersNumber = 0, proofsEnabled = true, customMinaNodeUrl = undefined, customMinaArchiveNodeUrl = undefined, networkId = undefined, } = params;
|
|
35
35
|
if (currentNetwork !== undefined) {
|
|
36
36
|
if (currentNetwork?.network.chainId === chain) {
|
|
37
37
|
return currentNetwork;
|
|
@@ -74,7 +74,7 @@ async function initBlockchain(params) {
|
|
|
74
74
|
mina,
|
|
75
75
|
archive,
|
|
76
76
|
lightnetAccountManager: network.accountManager,
|
|
77
|
-
networkId: chain === "mina:mainnet" ? "mainnet" : "testnet",
|
|
77
|
+
networkId: networkId ?? (chain === "mina:mainnet" ? "mainnet" : "testnet"),
|
|
78
78
|
bypassTransactionLimits: chain === "zeko:testnet" || chain === "zeko:alphanet",
|
|
79
79
|
});
|
|
80
80
|
Mina.setActiveInstance(networkInstance);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mina.js","sourceRoot":"","sources":["../../../src/utils/mina.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,cAAc,EACd,kBAAkB,EAElB,cAAc,EACd,gBAAgB,EAChB,iBAAiB,EACjB,WAAW,GACZ,CAAC;AAEF,OAAO,EACL,IAAI,EAEJ,UAAU,EACV,MAAM,EACN,YAAY,EAEZ,QAAQ,EACR,aAAa,
|
|
1
|
+
{"version":3,"file":"mina.js","sourceRoot":"","sources":["../../../src/utils/mina.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@silvana-one/mina-utils",
|
|
3
3
|
"description": "Silvana Mina Utils",
|
|
4
|
-
"version": "1.2.
|
|
4
|
+
"version": "1.2.2",
|
|
5
5
|
"author": "DFST",
|
|
6
6
|
"bugs": "https://github.com/SilvanaOne/silvana-lib/issues",
|
|
7
7
|
"dependencies": {
|
|
@@ -47,8 +47,8 @@
|
|
|
47
47
|
"license": "Apache-2.0",
|
|
48
48
|
"main": "dist/web/index.js",
|
|
49
49
|
"peerDependencies": {
|
|
50
|
-
"o1js": "2.
|
|
51
|
-
"@silvana-one/api": "1.2.
|
|
50
|
+
"o1js": "2.15.0",
|
|
51
|
+
"@silvana-one/api": "1.2.2"
|
|
52
52
|
},
|
|
53
53
|
"publishConfig": {
|
|
54
54
|
"access": "public"
|
|
@@ -92,7 +92,8 @@ export async function getAccountNonce(params: {
|
|
|
92
92
|
const canUseBlockBerry =
|
|
93
93
|
blockBerryApiKey !== undefined &&
|
|
94
94
|
(chain === "mina:devnet" || chain === "mina:mainnet");
|
|
95
|
-
if (chain === "zeko:testnet") {
|
|
95
|
+
if (chain === "zeko:testnet" || chain === "mina:testnet") {
|
|
96
|
+
// BlockBerry has no mesa/testnet endpoint, so read the nonce directly from the node.
|
|
96
97
|
const publicKey = PublicKey.fromBase58(account);
|
|
97
98
|
await fetchMinaAccount({ publicKey });
|
|
98
99
|
const nonce = Number(Mina.getAccount(publicKey).nonce.toBigint());
|
package/src/utils/mina.ts
CHANGED
|
@@ -18,6 +18,7 @@ import {
|
|
|
18
18
|
Field,
|
|
19
19
|
Lightnet,
|
|
20
20
|
CircuitString,
|
|
21
|
+
NetworkId,
|
|
21
22
|
} from "o1js";
|
|
22
23
|
import {
|
|
23
24
|
networks,
|
|
@@ -78,6 +79,7 @@ async function initBlockchain(params: {
|
|
|
78
79
|
proofsEnabled?: boolean;
|
|
79
80
|
customMinaNodeUrl?: string;
|
|
80
81
|
customMinaArchiveNodeUrl?: string;
|
|
82
|
+
networkId?: NetworkId;
|
|
81
83
|
}): Promise<MinaNetworkInstance> {
|
|
82
84
|
const {
|
|
83
85
|
chain,
|
|
@@ -85,13 +87,14 @@ async function initBlockchain(params: {
|
|
|
85
87
|
proofsEnabled = true,
|
|
86
88
|
customMinaNodeUrl = undefined,
|
|
87
89
|
customMinaArchiveNodeUrl = undefined,
|
|
90
|
+
networkId = undefined,
|
|
88
91
|
} = params;
|
|
89
92
|
if (currentNetwork !== undefined) {
|
|
90
93
|
if (currentNetwork?.network.chainId === chain) {
|
|
91
94
|
return currentNetwork;
|
|
92
95
|
} else {
|
|
93
96
|
throw new Error(
|
|
94
|
-
`Network is already initialized to different chain ${currentNetwork.network.chainId}, cannot initialize to ${chain}
|
|
97
|
+
`Network is already initialized to different chain ${currentNetwork.network.chainId}, cannot initialize to ${chain}`,
|
|
95
98
|
);
|
|
96
99
|
}
|
|
97
100
|
}
|
|
@@ -134,7 +137,7 @@ async function initBlockchain(params: {
|
|
|
134
137
|
mina,
|
|
135
138
|
archive,
|
|
136
139
|
lightnetAccountManager: network.accountManager,
|
|
137
|
-
networkId: chain === "mina:mainnet" ? "mainnet" : "testnet",
|
|
140
|
+
networkId: networkId ?? (chain === "mina:mainnet" ? "mainnet" : "testnet"),
|
|
138
141
|
bypassTransactionLimits:
|
|
139
142
|
chain === "zeko:testnet" || chain === "zeko:alphanet",
|
|
140
143
|
});
|