@rocketh/read-execute 0.11.22 → 0.11.23-testing.1
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.d.ts +6 -10
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +163 -172
- package/dist/index.js.map +1 -1
- package/package.json +2 -5
package/dist/index.d.ts
CHANGED
|
@@ -1,16 +1,7 @@
|
|
|
1
1
|
import { Abi } from 'abitype';
|
|
2
2
|
import { EIP1193DATA } from 'eip-1193';
|
|
3
|
-
import type { MinimalDeployment } from 'rocketh';
|
|
3
|
+
import type { Environment, MinimalDeployment } from 'rocketh';
|
|
4
4
|
import { ContractFunctionArgs, ContractFunctionName, DecodeFunctionResultReturnType, ReadContractParameters, TransactionRequestEIP1559, WriteContractParameters } from 'viem';
|
|
5
|
-
declare module 'rocketh' {
|
|
6
|
-
interface Environment {
|
|
7
|
-
execute: ExecuteFunction;
|
|
8
|
-
read: ReadFunction;
|
|
9
|
-
executeByName: ExecuteFunctionByName;
|
|
10
|
-
readByName: ReadFunctionByName;
|
|
11
|
-
tx: TxFunction;
|
|
12
|
-
}
|
|
13
|
-
}
|
|
14
5
|
type TransactionData = Omit<TransactionRequestEIP1559, 'from' | 'nonce'> & {
|
|
15
6
|
account: string;
|
|
16
7
|
};
|
|
@@ -25,5 +16,10 @@ export type ExecutionArgs<TAbi extends Abi, TFunctionName extends ContractFuncti
|
|
|
25
16
|
export type ReadingArgs<TAbi extends Abi, TFunctionName extends ContractFunctionName<TAbi, 'pure' | 'view'>, TArgs extends ContractFunctionArgs<TAbi, 'pure' | 'view', TFunctionName> = ContractFunctionArgs<TAbi, 'pure' | 'view', TFunctionName>> = Omit<ReadContractParameters<TAbi, TFunctionName, TArgs>, 'address' | 'abi' | 'account' | 'nonce'> & {
|
|
26
17
|
account?: string;
|
|
27
18
|
};
|
|
19
|
+
export declare function execute<TAbi extends Abi, TFunctionName extends ContractFunctionName<TAbi, 'nonpayable' | 'payable'>, TArgs extends ContractFunctionArgs<TAbi, 'nonpayable' | 'payable', TFunctionName> = ContractFunctionArgs<TAbi, 'nonpayable' | 'payable', TFunctionName>>(env: Environment, deployment: MinimalDeployment<TAbi>, args: ExecutionArgs<TAbi, TFunctionName, TArgs>): Promise<`0x${string}`>;
|
|
20
|
+
export declare function executeByName<TAbi extends Abi, TFunctionName extends ContractFunctionName<TAbi, 'nonpayable' | 'payable'>, TArgs extends ContractFunctionArgs<TAbi, 'nonpayable' | 'payable', TFunctionName> = ContractFunctionArgs<TAbi, 'nonpayable' | 'payable', TFunctionName>>(env: Environment, name: string, args: ExecutionArgs<TAbi, TFunctionName, TArgs>): Promise<`0x${string}`>;
|
|
21
|
+
export declare function read<TAbi extends Abi, TFunctionName extends ContractFunctionName<TAbi, 'pure' | 'view'>, TArgs extends ContractFunctionArgs<TAbi, 'pure' | 'view', TFunctionName> = ContractFunctionArgs<TAbi, 'pure' | 'view', TFunctionName>>(env: Environment, deployment: MinimalDeployment<TAbi>, args: ReadingArgs<TAbi, TFunctionName, TArgs>): Promise<DecodeFunctionResultReturnType<TAbi, TFunctionName>>;
|
|
22
|
+
export declare function readByName<TAbi extends Abi, TFunctionName extends ContractFunctionName<TAbi, 'pure' | 'view'>, TArgs extends ContractFunctionArgs<TAbi, 'pure' | 'view', TFunctionName> = ContractFunctionArgs<TAbi, 'pure' | 'view', TFunctionName>>(env: Environment, name: string, args: ReadingArgs<TAbi, TFunctionName, TArgs>): Promise<DecodeFunctionResultReturnType<TAbi, TFunctionName>>;
|
|
23
|
+
export declare function tx(env: Environment, txData: TransactionData): Promise<EIP1193DATA>;
|
|
28
24
|
export {};
|
|
29
25
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,GAAG,EAAC,MAAM,SAAS,CAAC;AAC5B,OAAO,EAAC,WAAW,EAAyB,MAAM,UAAU,CAAC;AAC7D,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -1,141 +1,86 @@
|
|
|
1
|
-
import { extendEnvironment } from 'rocketh';
|
|
2
1
|
import { decodeFunctionResult, encodeFunctionData, } from 'viem';
|
|
3
2
|
import { logs } from 'named-logs';
|
|
4
3
|
const logger = logs('@rocketh/read-execute');
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
throw new Error(`no address for ${account}`);
|
|
17
|
-
}
|
|
18
|
-
}
|
|
19
|
-
else {
|
|
20
|
-
throw new Error(`no accounts setup, cannot get address for ${account}`);
|
|
4
|
+
export async function execute(env, deployment, args) {
|
|
5
|
+
const { account, ...viemArgs } = args;
|
|
6
|
+
let address;
|
|
7
|
+
if (account.startsWith('0x')) {
|
|
8
|
+
address = account;
|
|
9
|
+
}
|
|
10
|
+
else {
|
|
11
|
+
if (env.namedAccounts) {
|
|
12
|
+
address = env.namedAccounts[account];
|
|
13
|
+
if (!address) {
|
|
14
|
+
throw new Error(`no address for ${account}`);
|
|
21
15
|
}
|
|
22
16
|
}
|
|
23
|
-
const artifactToUse = deployment;
|
|
24
|
-
const abi = artifactToUse.abi;
|
|
25
|
-
const calldata = encodeFunctionData({
|
|
26
|
-
abi,
|
|
27
|
-
functionName: viemArgs.functionName,
|
|
28
|
-
args: viemArgs.args,
|
|
29
|
-
});
|
|
30
|
-
const signer = env.addressSigners[address];
|
|
31
|
-
const txParam = {
|
|
32
|
-
to: deployment.address,
|
|
33
|
-
type: '0x2',
|
|
34
|
-
from: address,
|
|
35
|
-
chainId: `0x${env.network.chain.id.toString(16)}`,
|
|
36
|
-
data: calldata,
|
|
37
|
-
gas: viemArgs.gas && `0x${viemArgs.gas.toString(16)}`,
|
|
38
|
-
// gasPrice: viemArgs.gasPrice && `0x${viemArgs.gasPrice.toString(16)}` as `0x${string}`,
|
|
39
|
-
maxFeePerGas: viemArgs.maxFeePerGas ? `0x${viemArgs.maxFeePerGas.toString(16)}` : undefined,
|
|
40
|
-
maxPriorityFeePerGas: viemArgs.maxPriorityFeePerGas
|
|
41
|
-
? `0x${viemArgs.maxPriorityFeePerGas.toString(16)}`
|
|
42
|
-
: undefined,
|
|
43
|
-
accessList: viemArgs.accessList, // TODO
|
|
44
|
-
// nonce: viemArgs.nonce ? (`0x${viemArgs.nonce.toString(16)}` as `0x${string}`) : undefined,
|
|
45
|
-
};
|
|
46
|
-
if (viemArgs.value) {
|
|
47
|
-
txParam.value = `0x${viemArgs.value?.toString(16)}`;
|
|
48
|
-
}
|
|
49
|
-
let txHash;
|
|
50
|
-
if (signer.type === 'wallet' || signer.type === 'remote') {
|
|
51
|
-
txHash = await signer.signer.request({
|
|
52
|
-
method: 'eth_sendTransaction',
|
|
53
|
-
params: [txParam], // TODO fix eip-1193 ?,,
|
|
54
|
-
});
|
|
55
|
-
}
|
|
56
17
|
else {
|
|
57
|
-
|
|
58
|
-
method: 'eth_signTransaction',
|
|
59
|
-
params: [txParam],
|
|
60
|
-
});
|
|
61
|
-
txHash = await env.network.provider.request({
|
|
62
|
-
method: 'eth_sendRawTransaction',
|
|
63
|
-
params: [rawTx],
|
|
64
|
-
});
|
|
18
|
+
throw new Error(`no accounts setup, cannot get address for ${account}`);
|
|
65
19
|
}
|
|
66
|
-
const pendingExecution = {
|
|
67
|
-
type: 'execution',
|
|
68
|
-
transaction: { hash: txHash, origin: address },
|
|
69
|
-
// description, // TODO
|
|
70
|
-
// TODO we should have the nonce, except for wallet like metamask where it is not usre you get the nonce you start with
|
|
71
|
-
};
|
|
72
|
-
await env.savePendingExecution(pendingExecution);
|
|
73
|
-
return txHash;
|
|
74
20
|
}
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
21
|
+
const artifactToUse = deployment;
|
|
22
|
+
const abi = artifactToUse.abi;
|
|
23
|
+
const calldata = encodeFunctionData({
|
|
24
|
+
abi,
|
|
25
|
+
functionName: viemArgs.functionName,
|
|
26
|
+
args: viemArgs.args,
|
|
27
|
+
});
|
|
28
|
+
const signer = env.addressSigners[address];
|
|
29
|
+
const txParam = {
|
|
30
|
+
to: deployment.address,
|
|
31
|
+
type: '0x2',
|
|
32
|
+
from: address,
|
|
33
|
+
chainId: `0x${env.network.chain.id.toString(16)}`,
|
|
34
|
+
data: calldata,
|
|
35
|
+
gas: viemArgs.gas && `0x${viemArgs.gas.toString(16)}`,
|
|
36
|
+
// gasPrice: viemArgs.gasPrice && `0x${viemArgs.gasPrice.toString(16)}` as `0x${string}`,
|
|
37
|
+
maxFeePerGas: viemArgs.maxFeePerGas ? `0x${viemArgs.maxFeePerGas.toString(16)}` : undefined,
|
|
38
|
+
maxPriorityFeePerGas: viemArgs.maxPriorityFeePerGas
|
|
39
|
+
? `0x${viemArgs.maxPriorityFeePerGas.toString(16)}`
|
|
40
|
+
: undefined,
|
|
41
|
+
accessList: viemArgs.accessList, // TODO
|
|
42
|
+
// nonce: viemArgs.nonce ? (`0x${viemArgs.nonce.toString(16)}` as `0x${string}`) : undefined,
|
|
43
|
+
};
|
|
44
|
+
if (viemArgs.value) {
|
|
45
|
+
txParam.value = `0x${viemArgs.value?.toString(16)}`;
|
|
81
46
|
}
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
address = account;
|
|
88
|
-
}
|
|
89
|
-
else {
|
|
90
|
-
if (env.namedAccounts) {
|
|
91
|
-
address = env.namedAccounts[account];
|
|
92
|
-
if (!address) {
|
|
93
|
-
throw new Error(`no address for ${account}`);
|
|
94
|
-
}
|
|
95
|
-
}
|
|
96
|
-
else {
|
|
97
|
-
throw new Error(`no accounts setup, cannot get address for ${account}`);
|
|
98
|
-
}
|
|
99
|
-
}
|
|
100
|
-
}
|
|
101
|
-
const artifactToUse = deployment;
|
|
102
|
-
const abi = artifactToUse.abi;
|
|
103
|
-
const calldata = encodeFunctionData({
|
|
104
|
-
abi,
|
|
105
|
-
functionName: viemArgs.functionName,
|
|
106
|
-
args: viemArgs.args,
|
|
47
|
+
let txHash;
|
|
48
|
+
if (signer.type === 'wallet' || signer.type === 'remote') {
|
|
49
|
+
txHash = await signer.signer.request({
|
|
50
|
+
method: 'eth_sendTransaction',
|
|
51
|
+
params: [txParam], // TODO fix eip-1193 ?,,
|
|
107
52
|
});
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
// value: `0x${viemArgs.value?.toString(16)}` as `0x${string}`,
|
|
118
|
-
},
|
|
119
|
-
], // TODO fix eip-1193 ?,,
|
|
120
|
-
}));
|
|
121
|
-
const parsed = decodeFunctionResult({
|
|
122
|
-
abi,
|
|
123
|
-
functionName: viemArgs.functionName,
|
|
124
|
-
data: result,
|
|
125
|
-
args: viemArgs.args,
|
|
53
|
+
}
|
|
54
|
+
else {
|
|
55
|
+
const rawTx = await signer.signer.request({
|
|
56
|
+
method: 'eth_signTransaction',
|
|
57
|
+
params: [txParam],
|
|
58
|
+
});
|
|
59
|
+
txHash = await env.network.provider.request({
|
|
60
|
+
method: 'eth_sendRawTransaction',
|
|
61
|
+
params: [rawTx],
|
|
126
62
|
});
|
|
127
|
-
return parsed;
|
|
128
63
|
}
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
64
|
+
const pendingExecution = {
|
|
65
|
+
type: 'execution',
|
|
66
|
+
transaction: { hash: txHash, origin: address },
|
|
67
|
+
// description, // TODO
|
|
68
|
+
// TODO we should have the nonce, except for wallet like metamask where it is not usre you get the nonce you start with
|
|
69
|
+
};
|
|
70
|
+
await env.savePendingExecution(pendingExecution);
|
|
71
|
+
return txHash;
|
|
72
|
+
}
|
|
73
|
+
export async function executeByName(env, name, args) {
|
|
74
|
+
const deployment = env.getOrNull(name);
|
|
75
|
+
if (!deployment) {
|
|
76
|
+
throw new Error(`no deployment named ${name}`);
|
|
135
77
|
}
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
78
|
+
return execute(env, deployment, args);
|
|
79
|
+
}
|
|
80
|
+
export async function read(env, deployment, args) {
|
|
81
|
+
const { account, ...viemArgs } = args;
|
|
82
|
+
let address;
|
|
83
|
+
if (account) {
|
|
139
84
|
if (account.startsWith('0x')) {
|
|
140
85
|
address = account;
|
|
141
86
|
}
|
|
@@ -150,55 +95,101 @@ extendEnvironment((env) => {
|
|
|
150
95
|
throw new Error(`no accounts setup, cannot get address for ${account}`);
|
|
151
96
|
}
|
|
152
97
|
}
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
98
|
+
}
|
|
99
|
+
const artifactToUse = deployment;
|
|
100
|
+
const abi = artifactToUse.abi;
|
|
101
|
+
const calldata = encodeFunctionData({
|
|
102
|
+
abi,
|
|
103
|
+
functionName: viemArgs.functionName,
|
|
104
|
+
args: viemArgs.args,
|
|
105
|
+
});
|
|
106
|
+
const result = (await env.network.provider.request({
|
|
107
|
+
method: 'eth_call',
|
|
108
|
+
params: [
|
|
109
|
+
{
|
|
110
|
+
to: deployment.address,
|
|
111
|
+
type: '0x2',
|
|
112
|
+
from: address,
|
|
113
|
+
chainId: `0x${env.network.chain.id.toString(16)}`,
|
|
114
|
+
data: calldata,
|
|
115
|
+
// value: `0x${viemArgs.value?.toString(16)}` as `0x${string}`,
|
|
116
|
+
},
|
|
117
|
+
], // TODO fix eip-1193 ?,,
|
|
118
|
+
}));
|
|
119
|
+
const parsed = decodeFunctionResult({
|
|
120
|
+
abi,
|
|
121
|
+
functionName: viemArgs.functionName,
|
|
122
|
+
data: result,
|
|
123
|
+
args: viemArgs.args,
|
|
124
|
+
});
|
|
125
|
+
return parsed;
|
|
126
|
+
}
|
|
127
|
+
export async function readByName(env, name, args) {
|
|
128
|
+
const deployment = env.getOrNull(name);
|
|
129
|
+
if (!deployment) {
|
|
130
|
+
throw new Error(`no deployment named ${name}`);
|
|
131
|
+
}
|
|
132
|
+
return read(env, deployment, args);
|
|
133
|
+
}
|
|
134
|
+
export async function tx(env, txData) {
|
|
135
|
+
const { account, ...viemArgs } = txData;
|
|
136
|
+
let address;
|
|
137
|
+
if (account.startsWith('0x')) {
|
|
138
|
+
address = account;
|
|
139
|
+
}
|
|
140
|
+
else {
|
|
141
|
+
if (env.namedAccounts) {
|
|
142
|
+
address = env.namedAccounts[account];
|
|
143
|
+
if (!address) {
|
|
144
|
+
throw new Error(`no address for ${account}`);
|
|
145
|
+
}
|
|
177
146
|
}
|
|
178
147
|
else {
|
|
179
|
-
|
|
180
|
-
method: 'eth_signTransaction',
|
|
181
|
-
params: [txParam],
|
|
182
|
-
});
|
|
183
|
-
txHash = await env.network.provider.request({
|
|
184
|
-
method: 'eth_sendRawTransaction',
|
|
185
|
-
params: [rawTx],
|
|
186
|
-
});
|
|
148
|
+
throw new Error(`no accounts setup, cannot get address for ${account}`);
|
|
187
149
|
}
|
|
188
|
-
const pendingExecution = {
|
|
189
|
-
type: 'execution',
|
|
190
|
-
transaction: { hash: txHash, origin: address },
|
|
191
|
-
// description, // TODO
|
|
192
|
-
// TODO we should have the nonce, except for wallet like metamask where it is not usre you get the nonce you start with
|
|
193
|
-
};
|
|
194
|
-
await env.savePendingExecution(pendingExecution);
|
|
195
|
-
return txHash;
|
|
196
150
|
}
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
151
|
+
const signer = env.addressSigners[address];
|
|
152
|
+
const txParam = {
|
|
153
|
+
type: '0x2',
|
|
154
|
+
to: txData.to || undefined,
|
|
155
|
+
from: address,
|
|
156
|
+
chainId: `0x${env.network.chain.id.toString(16)}`,
|
|
157
|
+
data: txData.data,
|
|
158
|
+
gas: viemArgs.gas ? `0x${viemArgs.gas.toString(16)}` : undefined,
|
|
159
|
+
maxFeePerGas: viemArgs.maxFeePerGas ? `0x${viemArgs.maxFeePerGas.toString(16)}` : undefined,
|
|
160
|
+
maxPriorityFeePerGas: viemArgs.maxPriorityFeePerGas
|
|
161
|
+
? `0x${viemArgs.maxPriorityFeePerGas.toString(16)}`
|
|
162
|
+
: undefined,
|
|
163
|
+
// nonce: viemArgs.nonce ? (`0x${viemArgs.nonce.toString(16)}` as `0x${string}`) : undefined,
|
|
164
|
+
accessList: viemArgs.accessList, // TODO check
|
|
165
|
+
};
|
|
166
|
+
if (viemArgs.value) {
|
|
167
|
+
txParam.value = `0x${viemArgs.value?.toString(16)}`;
|
|
168
|
+
}
|
|
169
|
+
let txHash;
|
|
170
|
+
if (signer.type === 'wallet' || signer.type === 'remote') {
|
|
171
|
+
txHash = await signer.signer.request({
|
|
172
|
+
method: 'eth_sendTransaction',
|
|
173
|
+
params: [txParam], // TODO fix eip-1193 ?,,
|
|
174
|
+
});
|
|
175
|
+
}
|
|
176
|
+
else {
|
|
177
|
+
const rawTx = await signer.signer.request({
|
|
178
|
+
method: 'eth_signTransaction',
|
|
179
|
+
params: [txParam],
|
|
180
|
+
});
|
|
181
|
+
txHash = await env.network.provider.request({
|
|
182
|
+
method: 'eth_sendRawTransaction',
|
|
183
|
+
params: [rawTx],
|
|
184
|
+
});
|
|
185
|
+
}
|
|
186
|
+
const pendingExecution = {
|
|
187
|
+
type: 'execution',
|
|
188
|
+
transaction: { hash: txHash, origin: address },
|
|
189
|
+
// description, // TODO
|
|
190
|
+
// TODO we should have the nonce, except for wallet like metamask where it is not usre you get the nonce you start with
|
|
191
|
+
};
|
|
192
|
+
await env.savePendingExecution(pendingExecution);
|
|
193
|
+
return txHash;
|
|
194
|
+
}
|
|
204
195
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAGA,OAAO,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@rocketh/read-execute",
|
|
3
|
-
"version": "0.11.
|
|
3
|
+
"version": "0.11.23-testing.1",
|
|
4
4
|
"description": "provide read abd execute functions for rocketh",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"access": "public"
|
|
@@ -24,10 +24,7 @@
|
|
|
24
24
|
"eip-1193": "^0.6.2",
|
|
25
25
|
"rimraf": "^6.0.1",
|
|
26
26
|
"typescript": "^5.8.2",
|
|
27
|
-
"rocketh": "0.11.
|
|
28
|
-
},
|
|
29
|
-
"peerDependencies": {
|
|
30
|
-
"rocketh": "0.11.21"
|
|
27
|
+
"rocketh": "0.11.22-testing.1"
|
|
31
28
|
},
|
|
32
29
|
"dependencies": {
|
|
33
30
|
"named-logs": "^0.3.2",
|