dequanto 0.1.22 → 0.1.23
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/chains/arbitrum/TokensServiceArbitrum.d.ts +1 -1
- package/lib/cjs/clients/EvmWeb3Client.d.ts +3 -0
- package/lib/cjs/clients/EvmWeb3Client.js +23 -4
- package/lib/cjs/clients/EvmWeb3Client.js.map +1 -1
- package/lib/cjs/clients/Web3Client.d.ts +2 -2
- package/lib/cjs/clients/Web3ClientFactory.js +1 -1
- package/lib/cjs/clients/Web3ClientFactory.js.map +1 -1
- package/lib/cjs/config/ConfigDefaults.js +14 -0
- package/lib/cjs/config/ConfigDefaults.js.map +1 -1
- package/lib/cjs/erc4337/models/UserOperation.d.ts +1 -1
- package/lib/cjs/gen/GeneratorFromAbi.d.ts +3 -1
- package/lib/cjs/gen/GeneratorFromAbi.js +87 -68
- package/lib/cjs/gen/GeneratorFromAbi.js.map +1 -1
- package/lib/cjs/gen/GeneratorStorageReader.d.ts +1 -0
- package/lib/cjs/gen/GeneratorStorageReader.js +13 -1
- package/lib/cjs/gen/GeneratorStorageReader.js.map +1 -1
- package/lib/cjs/hardhat/HardhatProvider.d.ts +24 -1
- package/lib/cjs/hardhat/HardhatProvider.js +27 -13
- package/lib/cjs/hardhat/HardhatProvider.js.map +1 -1
- package/lib/cjs/ns/providers/EnsProvider.d.ts +2 -2
- package/lib/cjs/safe/GnosisSafeFactory.js.map +1 -1
- package/lib/cjs/safe/GnosisSafeService.js.map +1 -1
- package/lib/cjs/safe/SafeTx.js.map +1 -1
- package/lib/cjs/safe/transport/FileServiceTransport.js.map +1 -1
- package/lib/cjs/safe/transport/InMemoryServiceTransport.js.map +1 -1
- package/lib/cjs/services/TimelockService/TimelockService.d.ts +1 -1
- package/lib/cjs/tokens/TokenExchanges/AmmV2ExchangeBase.d.ts +4 -4
- package/lib/cjs/tokens/TokenExchanges/AmmV2ExchangeBase.js.map +1 -1
- package/lib/cjs/tokens/TokenExchanges/OneInchExchange.js.map +1 -1
- package/lib/cjs/tokens/TokenOracles/amm/AmmV1Oracle.js.map +1 -1
- package/lib/cjs/tokens/TokenService.js.map +1 -1
- package/lib/cjs/tokens/TokensService.d.ts +1 -1
- package/lib/cjs/tokens/TokensService.js.map +1 -1
- package/lib/cjs/tokens/TokensServiceBsc.d.ts +1 -1
- package/lib/cjs/tokens/TokensServicePolygon.d.ts +1 -1
- package/lib/cjs/tokens/TokensServiceXDai.d.ts +1 -1
- package/lib/cjs/utils/$logger.js +4 -0
- package/lib/cjs/utils/$logger.js.map +1 -1
- package/lib/cjs/utils/$path.js +4 -2
- package/lib/cjs/utils/$path.js.map +1 -1
- package/lib/cjs/wallets/Wallet.js.map +1 -1
- package/lib/esm/chains/arbitrum/TokensServiceArbitrum.d.ts +1 -1
- package/lib/esm/clients/EvmWeb3Client.d.ts +3 -0
- package/lib/esm/clients/EvmWeb3Client.js.map +1 -1
- package/lib/esm/clients/EvmWeb3Client.mjs +21 -3
- package/lib/esm/clients/Web3Client.d.ts +2 -2
- package/lib/esm/clients/Web3ClientFactory.js.map +1 -1
- package/lib/esm/clients/Web3ClientFactory.mjs +1 -1
- package/lib/esm/config/ConfigDefaults.js.map +1 -1
- package/lib/esm/config/ConfigDefaults.mjs +14 -0
- package/lib/esm/erc4337/models/UserOperation.d.ts +1 -1
- package/lib/esm/gen/GeneratorFromAbi.d.ts +3 -1
- package/lib/esm/gen/GeneratorFromAbi.js.map +1 -1
- package/lib/esm/gen/GeneratorFromAbi.mjs +87 -68
- package/lib/esm/gen/GeneratorStorageReader.d.ts +1 -0
- package/lib/esm/gen/GeneratorStorageReader.js.map +1 -1
- package/lib/esm/gen/GeneratorStorageReader.mjs +13 -1
- package/lib/esm/hardhat/HardhatProvider.d.ts +24 -1
- package/lib/esm/hardhat/HardhatProvider.js.map +1 -1
- package/lib/esm/hardhat/HardhatProvider.mjs +27 -13
- package/lib/esm/ns/providers/EnsProvider.d.ts +2 -2
- package/lib/esm/safe/GnosisSafeFactory.js.map +1 -1
- package/lib/esm/safe/GnosisSafeService.js.map +1 -1
- package/lib/esm/safe/SafeTx.js.map +1 -1
- package/lib/esm/safe/transport/FileServiceTransport.js.map +1 -1
- package/lib/esm/safe/transport/InMemoryServiceTransport.js.map +1 -1
- package/lib/esm/services/TimelockService/TimelockService.d.ts +1 -1
- package/lib/esm/tokens/TokenExchanges/AmmV2ExchangeBase.d.ts +4 -4
- package/lib/esm/tokens/TokenExchanges/AmmV2ExchangeBase.js.map +1 -1
- package/lib/esm/tokens/TokenExchanges/OneInchExchange.js.map +1 -1
- package/lib/esm/tokens/TokenOracles/amm/AmmV1Oracle.js.map +1 -1
- package/lib/esm/tokens/TokenService.js.map +1 -1
- package/lib/esm/tokens/TokensService.d.ts +1 -1
- package/lib/esm/tokens/TokensService.js.map +1 -1
- package/lib/esm/tokens/TokensServiceBsc.d.ts +1 -1
- package/lib/esm/tokens/TokensServicePolygon.d.ts +1 -1
- package/lib/esm/tokens/TokensServiceXDai.d.ts +1 -1
- package/lib/esm/utils/$logger.js.map +1 -1
- package/lib/esm/utils/$logger.mjs +4 -0
- package/lib/esm/utils/$path.js.map +1 -1
- package/lib/esm/utils/$path.mjs +4 -2
- package/lib/esm/wallets/Wallet.js.map +1 -1
- package/package.json +4 -3
- package/src/chains/arbitrum/TokensServiceArbitrum.ts +1 -1
- package/src/clients/EvmWeb3Client.ts +23 -2
- package/src/clients/Web3Client.ts +2 -2
- package/src/clients/Web3ClientFactory.ts +1 -1
- package/src/config/ConfigDefaults.ts +14 -0
- package/src/erc4337/models/UserOperation.ts +1 -1
- package/src/gen/GeneratorFromAbi.ts +94 -68
- package/src/gen/GeneratorStorageReader.ts +16 -2
- package/src/gen/templates/ContractStorageReaderTemplate.d.ts.tmpl +7 -0
- package/src/gen/{ContractTemplate.d.ts.template → templates/ContractTemplate.d.ts.tmpl} +29 -30
- package/src/hardhat/HardhatProvider.ts +33 -22
- package/src/ns/providers/EnsProvider.ts +2 -2
- package/src/safe/GnosisSafeFactory.ts +2 -2
- package/src/safe/GnosisSafeService.ts +1 -1
- package/src/safe/SafeTx.ts +1 -1
- package/src/safe/transport/FileServiceTransport.ts +1 -1
- package/src/safe/transport/InMemoryServiceTransport.ts +1 -1
- package/src/services/TimelockService/TimelockService.ts +1 -1
- package/src/services/TimelockService/TimelockServiceFallbackSafe.ts +1 -1
- package/src/tokens/TokenExchanges/AmmV2ExchangeBase.ts +4 -4
- package/src/tokens/TokenExchanges/OneInchExchange.ts +1 -1
- package/src/tokens/TokenOracles/amm/AmmV1Oracle.ts +1 -1
- package/src/tokens/TokenService.ts +1 -1
- package/src/tokens/TokensService.ts +1 -1
- package/src/tokens/TokensServiceBsc.ts +1 -1
- package/src/tokens/TokensServicePolygon.ts +1 -1
- package/src/tokens/TokensServiceXDai.ts +1 -1
- package/src/utils/$logger.ts +4 -0
- package/src/utils/$path.ts +4 -2
- package/src/wallets/Wallet.ts +1 -1
- package/tsconfig.json +1 -0
- package/lib/cjs/gen/ContractStorageReaderTemplate.js +0 -13
- package/lib/cjs/gen/ContractStorageReaderTemplate.js.map +0 -1
- package/lib/cjs/gen/ContractTemplate.js +0 -56
- package/lib/cjs/gen/ContractTemplate.js.map +0 -1
- package/lib/esm/gen/ContractStorageReaderTemplate.js.map +0 -1
- package/lib/esm/gen/ContractStorageReaderTemplate.mjs +0 -13
- package/lib/esm/gen/ContractTemplate.js.map +0 -1
- package/lib/esm/gen/ContractTemplate.mjs +0 -49
- package/src/gen/ContractStorageReaderTemplate.d.ts.template +0 -14
- /package/src/gen/{ContractStorageReaderTemplate.js → templates/ContractStorageReaderTemplate.js.tmpl} +0 -0
- /package/src/gen/{ContractStorageReaderTemplate.ts → templates/ContractStorageReaderTemplate.ts.tmpl} +0 -0
- /package/src/gen/{ContractTemplate.js → templates/ContractTemplate.js.tmpl} +0 -0
- /package/src/gen/{ContractTemplate.ts → templates/ContractTemplate.ts.tmpl} +0 -0
|
@@ -31,24 +31,33 @@ export class GeneratorFromAbi {
|
|
|
31
31
|
return null;
|
|
32
32
|
})
|
|
33
33
|
.filter(Boolean)
|
|
34
|
-
.
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
34
|
+
.mapFull(arr => {
|
|
35
|
+
return {
|
|
36
|
+
ts: arr.map(x => Str.formatMethod(x.ts)),
|
|
37
|
+
js: arr.map(x => Str.formatMethod(x.js)),
|
|
38
|
+
types: arr.map(x => Str.formatMethod(x.types)),
|
|
39
|
+
};
|
|
40
|
+
});
|
|
41
|
+
let methodTypings = alot(abiJson)
|
|
38
42
|
.filter(x => x.type === 'function')
|
|
39
43
|
.groupBy(x => x.name)
|
|
40
44
|
.map(group => {
|
|
41
45
|
let item = group.values[0];
|
|
42
|
-
return Gen.
|
|
46
|
+
return Gen.serializeMethodTypingsTs(item.name, group.values);
|
|
43
47
|
})
|
|
44
48
|
.filter(Boolean)
|
|
45
49
|
.toArray();
|
|
46
|
-
let eventsArr = abiJson
|
|
50
|
+
let eventsArr = alot(abiJson)
|
|
47
51
|
.filter(x => x.type === 'event')
|
|
48
52
|
.map(x => Gen.serializeEvent(x))
|
|
49
53
|
.filter(Boolean)
|
|
50
|
-
.
|
|
51
|
-
|
|
54
|
+
.mapFull(arr => {
|
|
55
|
+
return {
|
|
56
|
+
ts: arr.map(x => Str.formatMethod(x.ts)),
|
|
57
|
+
js: arr.map(x => Str.formatMethod(x.js)),
|
|
58
|
+
types: arr.map(x => Str.formatMethod(x.types)),
|
|
59
|
+
};
|
|
60
|
+
});
|
|
52
61
|
let eventTypes = alot(abiJson)
|
|
53
62
|
.filter(x => x.type === 'event')
|
|
54
63
|
.groupBy(x => x.name)
|
|
@@ -59,74 +68,54 @@ export class GeneratorFromAbi {
|
|
|
59
68
|
.filter(Boolean)
|
|
60
69
|
.toArray();
|
|
61
70
|
//let eventInterfacesAll = Gen.serializeEventsInterfacesAllTs(abiJson.filter(x => x.type === 'event'));
|
|
62
|
-
let eventsExtractorsArr = abiJson
|
|
71
|
+
let eventsExtractorsArr = alot(abiJson)
|
|
63
72
|
.filter(x => x.type === 'event')
|
|
64
73
|
.map(x => Gen.serializeEventExtractor(x))
|
|
65
74
|
.filter(Boolean)
|
|
66
|
-
.
|
|
67
|
-
|
|
68
|
-
|
|
75
|
+
.mapFull(arr => {
|
|
76
|
+
return {
|
|
77
|
+
ts: arr.map(x => Str.formatMethod(x.ts)),
|
|
78
|
+
js: arr.map(x => Str.formatMethod(x.js)),
|
|
79
|
+
types: arr.map(x => Str.formatMethod(x.types)),
|
|
80
|
+
};
|
|
81
|
+
});
|
|
82
|
+
let eventsFetchersArr = alot(abiJson)
|
|
69
83
|
.filter(x => x.type === 'event')
|
|
70
84
|
.map(x => Gen.serializeEventFetcher(x))
|
|
71
85
|
.filter(Boolean)
|
|
72
|
-
.
|
|
73
|
-
|
|
86
|
+
.mapFull(arr => {
|
|
87
|
+
return {
|
|
88
|
+
ts: arr.map(x => Str.formatMethod(x.ts)),
|
|
89
|
+
js: arr.map(x => Str.formatMethod(x.js)),
|
|
90
|
+
types: arr.map(x => Str.formatMethod(x.types)),
|
|
91
|
+
};
|
|
92
|
+
});
|
|
74
93
|
// let eventInterfaces = abiJson
|
|
75
94
|
// .filter(x => x.type === 'event')
|
|
76
95
|
// .map(x => Gen.serializeEventInterface(x))
|
|
77
96
|
// .filter(Boolean)
|
|
78
97
|
// .map(Str.formatMethod);
|
|
79
|
-
let methods = methodsArr.join('\n\n');
|
|
80
|
-
let
|
|
81
|
-
let
|
|
82
|
-
let
|
|
98
|
+
let methods = methodsArr[targetType].join('\n\n');
|
|
99
|
+
let methodsTypings = methodsArr.types.join('\n\n');
|
|
100
|
+
let events = eventsArr[targetType].join('\n\n');
|
|
101
|
+
let eventsTypings = eventsArr.types.join('\n\n');
|
|
102
|
+
let eventsExtractors = eventsExtractorsArr[targetType].join('\n\n');
|
|
103
|
+
let eventsExtractorsTypings = eventsExtractorsArr.types.join('\n\n');
|
|
104
|
+
let eventsFetchers = eventsFetchersArr[targetType].join('\n\n');
|
|
105
|
+
let eventsFetchersTypings = eventsFetchersArr.types.join('\n\n');
|
|
83
106
|
let name = opts.name;
|
|
84
|
-
let templatePath = $path.resolve(`/src/gen/ContractTemplate.${targetType}`);
|
|
107
|
+
let templatePath = $path.resolve(`/src/gen/templates/ContractTemplate.${targetType}.tmpl`);
|
|
85
108
|
let template = await File.readAsync(templatePath, { skipHooks: true });
|
|
109
|
+
let templateDtsPath = $path.resolve(`/src/gen/templates/ContractTemplate.d.ts.tmpl`);
|
|
110
|
+
let templateDts = await File.readAsync(templateDtsPath, { skipHooks: true });
|
|
86
111
|
let EtherscanStr;
|
|
87
112
|
let EthWeb3ClientStr;
|
|
88
113
|
let imports = [];
|
|
89
114
|
let sourceUri;
|
|
90
115
|
let Web3ClientOptions = '';
|
|
91
116
|
let EvmScanOptions = '';
|
|
92
|
-
let importPfx =
|
|
117
|
+
let importPfx = true /* always */ ? 'dequanto' : '@dequanto';
|
|
93
118
|
switch (opts.network) {
|
|
94
|
-
case 'bsc':
|
|
95
|
-
EtherscanStr = 'Bscscan';
|
|
96
|
-
EthWeb3ClientStr = 'BscWeb3Client';
|
|
97
|
-
imports = [
|
|
98
|
-
`import { Bscscan } from '${importPfx}/explorer/Bscscan'`,
|
|
99
|
-
`import { BscWeb3Client } from '${importPfx}/clients/BscWeb3Client'`,
|
|
100
|
-
];
|
|
101
|
-
sourceUri = `https://bscscan.com/address/${opts.address}#code`;
|
|
102
|
-
break;
|
|
103
|
-
case 'polygon':
|
|
104
|
-
EtherscanStr = 'Polyscan';
|
|
105
|
-
EthWeb3ClientStr = 'PolyWeb3Client';
|
|
106
|
-
imports = [
|
|
107
|
-
`import { Polyscan } from '${importPfx}/explorer/Polyscan'`,
|
|
108
|
-
`import { PolyWeb3Client } from '${importPfx}/clients/PolyWeb3Client'`,
|
|
109
|
-
];
|
|
110
|
-
sourceUri = `https://polygonscan.com/address/${opts.address}#code`;
|
|
111
|
-
break;
|
|
112
|
-
case 'xdai':
|
|
113
|
-
EtherscanStr = 'XDaiscan';
|
|
114
|
-
EthWeb3ClientStr = 'XDaiWeb3Client';
|
|
115
|
-
imports = [
|
|
116
|
-
`import { XDaiscan } from '${importPfx}/chains/xdai/XDaiscan'`,
|
|
117
|
-
`import { XDaiWeb3Client } from '${importPfx}/chains/xdai/XDaiWeb3Client'`,
|
|
118
|
-
];
|
|
119
|
-
sourceUri = `https://blockscout.com/xdai/mainnet/address/${opts.address}/contracts`;
|
|
120
|
-
break;
|
|
121
|
-
case 'eth':
|
|
122
|
-
EtherscanStr = 'Etherscan';
|
|
123
|
-
EthWeb3ClientStr = 'EthWeb3Client';
|
|
124
|
-
imports = [
|
|
125
|
-
`import { Etherscan } from '${importPfx}/explorer/Etherscan'`,
|
|
126
|
-
`import { EthWeb3Client } from '${importPfx}/clients/EthWeb3Client'`,
|
|
127
|
-
];
|
|
128
|
-
sourceUri = `https://etherscan.io/address/${opts.address}#code`;
|
|
129
|
-
break;
|
|
130
119
|
case 'hardhat':
|
|
131
120
|
EtherscanStr = 'Etherscan';
|
|
132
121
|
EthWeb3ClientStr = 'HardhatWeb3Client';
|
|
@@ -175,6 +164,7 @@ export class GeneratorFromAbi {
|
|
|
175
164
|
let storageReaderInitializer = '';
|
|
176
165
|
let storageReaderProperty = '';
|
|
177
166
|
let storageReaderClass = '';
|
|
167
|
+
let storageReaderClassTypings = '';
|
|
178
168
|
try {
|
|
179
169
|
let storageReaderGenerator = new GeneratorStorageReader();
|
|
180
170
|
let reader = await storageReaderGenerator.generate({ ...opts, target: targetType });
|
|
@@ -183,6 +173,7 @@ export class GeneratorFromAbi {
|
|
|
183
173
|
}
|
|
184
174
|
if (reader.className) {
|
|
185
175
|
storageReaderClass = reader.code;
|
|
176
|
+
storageReaderClassTypings = reader.types;
|
|
186
177
|
storageReaderProperty = targetType === 'ts' ? `declare storage: ${reader.className}` : '';
|
|
187
178
|
storageReaderInitializer = `this.storage = new ${reader.className}(this.address, this.client, this.explorer);`;
|
|
188
179
|
$logger.log(`green<StorageReader> was generated`);
|
|
@@ -219,8 +210,32 @@ export class GeneratorFromAbi {
|
|
|
219
210
|
.replace(`/* TX_CALLER_METHODS */`, () => Gen.serializeTxCallerMethods(className, abiJson)[targetType])
|
|
220
211
|
.replace(`/* TX_DATA_METHODS */`, () => Gen.serializeTxDataMethods(className, abiJson)[targetType])
|
|
221
212
|
.replace(`/* $EVENT_TYPES$ */`, () => Str.indent(eventTypes.map(x => x.code).join('\n'), ' '))
|
|
222
|
-
.replace(`/* $METHOD_TYPES$ */`, () => Str.indent(
|
|
213
|
+
.replace(`/* $METHOD_TYPES$ */`, () => Str.indent(methodTypings.map(x => x.code).join('\n'), ' '));
|
|
214
|
+
let codeDts = templateDts
|
|
215
|
+
.replace(`/* IMPORTS */`, () => imports.join('\n'))
|
|
216
|
+
.replace(`/* ERRORS */`, () => Gen.serializeErrors(className, abiJson))
|
|
217
|
+
.replace(/\$NAME\$/g, className)
|
|
218
|
+
.replace(`$ADDRESS$`, opts.address ? `'${opts.address}'` : 'null')
|
|
219
|
+
.replace(`/* METHODS */`, methodsTypings)
|
|
220
|
+
.replace(`/* EVENTS */`, eventsTypings)
|
|
221
|
+
.replace(`/* EVENTS_EXTRACTORS */`, eventsExtractorsTypings)
|
|
222
|
+
.replace(`/* EVENTS_FETCHERS */`, eventsFetchersTypings)
|
|
223
|
+
.replace(`$ABI$`, () => JSON.stringify(abiJson))
|
|
224
|
+
.replace(`$DATE$`, $date.format(new Date(), 'yyyy-MM-dd HH:mm'))
|
|
225
|
+
.replace(`$EXPLORER_URL$`, sourceUri)
|
|
226
|
+
//.replace(`/* $EVENT_INTERFACES$ */`, () => eventInterfaces.join('\n') + '\n\n' + eventInterfacesAll.code + '\n\n')
|
|
227
|
+
.replace(`/* STORAGE_READER_INITIALIZER */`, storageReaderInitializer)
|
|
228
|
+
.replace(`/* STORAGE_READER_PROPERTY */`, storageReaderProperty)
|
|
229
|
+
.replace(`/* STORAGE_READER_CLASS */`, () => storageReaderClassTypings)
|
|
230
|
+
.replace(`/* TX_CALLER_METHODS */`, () => Gen.serializeTxCallerMethods(className, abiJson)[targetType])
|
|
231
|
+
.replace(`/* TX_DATA_METHODS */`, () => Gen.serializeTxDataMethods(className, abiJson)[targetType])
|
|
232
|
+
.replace(`/* $EVENT_TYPES$ */`, () => Str.indent(eventTypes.map(x => x.code).join('\n'), ' '))
|
|
233
|
+
.replace(`/* $METHOD_TYPES$ */`, () => Str.indent(methodTypings.map(x => x.code).join('\n'), ' '));
|
|
223
234
|
await File.writeAsync(outputPath, code, { skipHooks: true });
|
|
235
|
+
if (targetType === 'js') {
|
|
236
|
+
let outputPathDts = outputPath.replace(/\.\w+$/, '.d.ts');
|
|
237
|
+
await File.writeAsync(outputPathDts, codeDts, { skipHooks: true });
|
|
238
|
+
}
|
|
224
239
|
if (opts.saveAbi) {
|
|
225
240
|
let path = class_Uri.combine(opts.output, outputDirectory, `${outputFilename}Abi.json`);
|
|
226
241
|
await File.writeAsync(path, abiJson);
|
|
@@ -308,7 +323,7 @@ var Gen;
|
|
|
308
323
|
};
|
|
309
324
|
}
|
|
310
325
|
Gen.serializeMethodInterfacesTs = serializeMethodInterfacesTs;
|
|
311
|
-
function
|
|
326
|
+
function serializeMethodTypingsTs(name, abis) {
|
|
312
327
|
let args = abis.map(abi => {
|
|
313
328
|
let { fnInputArgumentsTargets } = serializeArgumentsTs(abi);
|
|
314
329
|
return `[ ${fnInputArgumentsTargets.ts} ]`;
|
|
@@ -326,7 +341,7 @@ var Gen;
|
|
|
326
341
|
code: code.join('\n')
|
|
327
342
|
};
|
|
328
343
|
}
|
|
329
|
-
Gen.
|
|
344
|
+
Gen.serializeMethodTypingsTs = serializeMethodTypingsTs;
|
|
330
345
|
function serializeMethodInterfacesAllTs(methods) {
|
|
331
346
|
let fields = methods.map(method => {
|
|
332
347
|
return ` ${method.method}: ${method.interface}`;
|
|
@@ -380,6 +395,9 @@ var Gen;
|
|
|
380
395
|
return this.$onLog('${abi.name}', fn);
|
|
381
396
|
}
|
|
382
397
|
`,
|
|
398
|
+
types: `
|
|
399
|
+
on${abi.name} (fn?: (event: TClientEventsStreamData<TEventArguments<'${abi.name}'>>) => void): ClientEventsStream<TClientEventsStreamData<TEventArguments<'${abi.name}'>>>
|
|
400
|
+
`,
|
|
383
401
|
js: `
|
|
384
402
|
on${abi.name} (fn) {
|
|
385
403
|
return this.$onLog('${abi.name}', fn);
|
|
@@ -396,6 +414,9 @@ var Gen;
|
|
|
396
414
|
return this.$extractLogs(tx, abi) as any as ITxLogItem<TEventParams<'${abi.name}'>>[];
|
|
397
415
|
}
|
|
398
416
|
`,
|
|
417
|
+
types: `
|
|
418
|
+
extractLogs${abi.name} (tx: TEth.TxReceipt): ITxLogItem<TEventParams<'${abi.name}'>>[]
|
|
419
|
+
`,
|
|
399
420
|
js: `
|
|
400
421
|
extractLogs${abi.name} (tx) {
|
|
401
422
|
let abi = this.$getAbiItem('event', '${abi.name}');
|
|
@@ -420,13 +441,11 @@ var Gen;
|
|
|
420
441
|
}
|
|
421
442
|
`,
|
|
422
443
|
types: `
|
|
423
|
-
|
|
444
|
+
getPastLogs${abi.name} (options?: {
|
|
424
445
|
fromBlock?: number | Date
|
|
425
446
|
toBlock?: number | Date
|
|
426
447
|
params?: { ${indexedParams} }
|
|
427
|
-
}): Promise<ITxLogItem<TEventParams<'${abi.name}'>>[]>
|
|
428
|
-
return await this.$getPastLogsParsed('${abi.name}', options) as any;
|
|
429
|
-
}
|
|
448
|
+
}): Promise<ITxLogItem<TEventParams<'${abi.name}'>>[]>
|
|
430
449
|
`,
|
|
431
450
|
js: `
|
|
432
451
|
async getPastLogs${abi.name} (options) {
|
|
@@ -475,7 +494,7 @@ var Gen;
|
|
|
475
494
|
`,
|
|
476
495
|
types: `
|
|
477
496
|
// ${$abiUtils.getMethodSignature(abi)}
|
|
478
|
-
|
|
497
|
+
${abi.name} (${fnInputArgumentsTargets.ts}): ${fnResult}
|
|
479
498
|
`,
|
|
480
499
|
js: `
|
|
481
500
|
// ${$abiUtils.getMethodSignature(abi)}
|
|
@@ -506,7 +525,7 @@ var Gen;
|
|
|
506
525
|
`,
|
|
507
526
|
types: `
|
|
508
527
|
${overrides}
|
|
509
|
-
|
|
528
|
+
${abi.name} (...args): ${fnResult}
|
|
510
529
|
`,
|
|
511
530
|
js: `
|
|
512
531
|
async ${abi.name} (...args) {
|
|
@@ -530,7 +549,7 @@ var Gen;
|
|
|
530
549
|
`,
|
|
531
550
|
types: `
|
|
532
551
|
// ${$abiUtils.getMethodSignature(abi)}
|
|
533
|
-
|
|
552
|
+
${abi.name} (sender: TSender, ${fnInputArgumentsTargets.ts}): Promise<TxWriter>
|
|
534
553
|
`,
|
|
535
554
|
js: `
|
|
536
555
|
// ${$abiUtils.getMethodSignature(abi)}
|
|
@@ -552,7 +571,7 @@ var Gen;
|
|
|
552
571
|
}
|
|
553
572
|
`,
|
|
554
573
|
types: `
|
|
555
|
-
|
|
574
|
+
$constructor (deployer: TSender, ${fnInputArgumentsTargets.ts}): Promise<TxWriter>
|
|
556
575
|
`,
|
|
557
576
|
js: `
|
|
558
577
|
async $constructor (deployer, ${fnInputArgumentsTargets.js}) {
|
|
@@ -581,7 +600,7 @@ var Gen;
|
|
|
581
600
|
`,
|
|
582
601
|
types: `
|
|
583
602
|
${overrides}
|
|
584
|
-
|
|
603
|
+
${abi.name} (sender: TSender, ...args): Promise<TxWriter>
|
|
585
604
|
`,
|
|
586
605
|
js: `
|
|
587
606
|
async ${abi.name} (sender, ...args) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GeneratorStorageReader.js","sourceRoot":"","sources":["../../../src/gen/GeneratorStorageReader.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAuB;AAIvB,gEAA4D;AAC5D,uDAAmD;AACnD,qCAA8B;AAC9B,qCAAiC;AACjC,uDAAmD;AACnD,iDAA6C;AAC7C,uCAAmC;AAGnC,MAAa,sBAAsB;IAE/B,KAAK,CAAC,QAAQ,CAAC,IAWd;QAEG,IAAI,UAAU,GAAG,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC;QACrC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;QACtD,IAAI,KAAK,GAAG,cAAI,CAAC,UAAU,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;YAC/C,OAAO;gBACH,IAAI,EAAE,CAAC,CAAC,GAAG;gBACX,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO;aAC3B,CAAC;QACN,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;QAEb,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;YACpB,OAAO;gBACH,KAAK,EAAE,IAAI,KAAK,CAAC,2EAA2E,CAAC;aAChG,CAAC;SACL;QACD,IAAI,IAAI,GAAG,IAAyB,CAAC;QACrC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;YACpB,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;SACnB;aAAM;YACH,mBAAQ,CAAC,OAAO,CAAC,YAAY,EAAE,wBAAwB,CAAC,CAAC;YAEzD,IAAI,GAAG,GAAG,IAAI,MAAM,CAAC,gBAAgB,YAAY,KAAK,EAAE,GAAG,CAAC,CAAA;YAC5D,IAAI,IAAI,GAAG,KAAK,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE;gBAChC,IAAI,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;gBAC5B,OAAO,CAAC,CAAC;YACb,CAAC,CAAC,CAAC;YACH,IAAI,GAAG,IAAI,CAAC;SACf;QAED,mBAAQ,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,IAAI,IAAI,EAAE,IAAI,EAAE,4CAA4C,CAAC,CAAA;QAE1F,IAAI,KAAK,GAAG,MAAM,yBAAW,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,EAAE,YAAY,EAAE,EAAE,KAAK,EAAE,CAAC,CAAA;QAErG,IAAI,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"GeneratorStorageReader.js","sourceRoot":"","sources":["../../../src/gen/GeneratorStorageReader.ts"],"names":[],"mappings":"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"}
|
|
@@ -38,16 +38,24 @@ export class GeneratorStorageReader {
|
|
|
38
38
|
let slots = await SlotsParser.slots({ code: file.content, path: file.path }, contractName, { files });
|
|
39
39
|
let methods = this.serializeSlots(slots);
|
|
40
40
|
let codeMethods = methods.map(x => x[targetType]).join('\n\n');
|
|
41
|
-
let
|
|
41
|
+
let codeMethodsTypings = methods.map(x => x.types).join('\n\n');
|
|
42
|
+
let templatePath = $path.resolve(`/src/gen/templates/ContractStorageReaderTemplate.${targetType}.tmpl`);
|
|
42
43
|
let template = await File.readAsync(templatePath, { skipHooks: true });
|
|
44
|
+
let templateTypingsPath = $path.resolve(`/src/gen/templates/ContractStorageReaderTemplate.d.ts.tmpl`);
|
|
45
|
+
let templateTypings = await File.readAsync(templateTypingsPath, { skipHooks: true });
|
|
43
46
|
let className = $gen.toClassName(opts.name + 'StorageReader');
|
|
44
47
|
let code = template
|
|
45
48
|
.replace(`$NAME$`, className)
|
|
46
49
|
.replace(`/* METHODS */`, () => codeMethods)
|
|
47
50
|
.replace(`$SLOTS$`, () => JSON.stringify(slots, null, ' '));
|
|
51
|
+
let codeTypings = templateTypings
|
|
52
|
+
.replace(`$NAME$`, className)
|
|
53
|
+
.replace(`/* METHODS */`, () => codeMethodsTypings)
|
|
54
|
+
.replace(`$SLOTS$`, () => JSON.stringify(slots, null, ' '));
|
|
48
55
|
return {
|
|
49
56
|
className: className,
|
|
50
57
|
code: code,
|
|
58
|
+
types: codeTypings,
|
|
51
59
|
sourcePath: file.path
|
|
52
60
|
};
|
|
53
61
|
}
|
|
@@ -58,6 +66,7 @@ export class GeneratorStorageReader {
|
|
|
58
66
|
return {
|
|
59
67
|
ts: Str.formatMethod(entry.ts),
|
|
60
68
|
js: Str.formatMethod(entry.js),
|
|
69
|
+
types: Str.formatMethod(entry.types),
|
|
61
70
|
};
|
|
62
71
|
});
|
|
63
72
|
}
|
|
@@ -71,6 +80,9 @@ export class GeneratorStorageReader {
|
|
|
71
80
|
return this.$storage.get(['${name}', ${parametersCall ?? ''}]);
|
|
72
81
|
}
|
|
73
82
|
`,
|
|
83
|
+
types: `
|
|
84
|
+
${name}(${parametersTypes?.ts ?? ''}): Promise<${returnType}>
|
|
85
|
+
`,
|
|
74
86
|
js: `
|
|
75
87
|
async ${name}(${parametersTypes?.js ?? ''}) {
|
|
76
88
|
return this.$storage.get(['${name}', ${parametersCall ?? ''}]);
|
|
@@ -134,5 +134,28 @@ export declare class HardhatProvider {
|
|
|
134
134
|
private getHardhatProvider;
|
|
135
135
|
private getArtifactJsonPath;
|
|
136
136
|
private getPaths;
|
|
137
|
-
private
|
|
137
|
+
private getSolFileContent;
|
|
138
|
+
getContractFromSolPath<T extends ContractBase = IContractWrapped>(solContractPath: string, options?: {
|
|
139
|
+
contractName?: string;
|
|
140
|
+
paths: {
|
|
141
|
+
sources?: string;
|
|
142
|
+
root?: string;
|
|
143
|
+
artifacts?: string;
|
|
144
|
+
};
|
|
145
|
+
}): Promise<{
|
|
146
|
+
abi: TEth.Abi.Item[];
|
|
147
|
+
bytecode: `0x${string}`;
|
|
148
|
+
output: string;
|
|
149
|
+
artifact: string;
|
|
150
|
+
source: {
|
|
151
|
+
contractName: string;
|
|
152
|
+
files: {
|
|
153
|
+
[key: string]: {
|
|
154
|
+
content: string;
|
|
155
|
+
};
|
|
156
|
+
};
|
|
157
|
+
};
|
|
158
|
+
linkReferences: Record<string, Record<string, any>>;
|
|
159
|
+
ContractCtor: Constructor<T>;
|
|
160
|
+
}>;
|
|
138
161
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HardhatProvider.js","sourceRoot":"","sources":["../../../src/hardhat/HardhatProvider.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"HardhatProvider.js","sourceRoot":"","sources":["../../../src/hardhat/HardhatProvider.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,6 +24,7 @@ import { $date } from '../utils/$date.mjs';
|
|
|
24
24
|
import { $hex } from '../utils/$hex.mjs';
|
|
25
25
|
import { $contract } from '../utils/$contract.mjs';
|
|
26
26
|
import { $dependency } from '../utils/$dependency.mjs';
|
|
27
|
+
const rgx_CONTRACT_NAME = /contract\s+(?<contractName>[\w_]+)/ig;
|
|
27
28
|
export class HardhatProvider {
|
|
28
29
|
client(network = 'hardhat', opts = null) {
|
|
29
30
|
opts ??= {};
|
|
@@ -190,12 +191,13 @@ export class HardhatProvider {
|
|
|
190
191
|
const hh = await this.getHardhat();
|
|
191
192
|
await hh.run('compile', hhOptions);
|
|
192
193
|
const files = await Directory.readFilesAsync(paths.sources, '*.sol');
|
|
193
|
-
|
|
194
|
+
const results = await alot(files).mapAsync(async (file) => {
|
|
194
195
|
let solContractPath = file.uri.toLocalFile();
|
|
195
196
|
return await this.getContractFromSolPath(solContractPath, {
|
|
196
197
|
paths
|
|
197
198
|
});
|
|
198
199
|
}).toArrayAsync();
|
|
200
|
+
return results.filter(x => x != null);
|
|
199
201
|
}
|
|
200
202
|
async compileSol(solContractPath, options) {
|
|
201
203
|
solContractPath = $path.normalize(solContractPath);
|
|
@@ -308,6 +310,10 @@ export class HardhatProvider {
|
|
|
308
310
|
async getArtifactJsonPath(solContractPath, options) {
|
|
309
311
|
let outputDir = class_Uri.combine(options.paths.artifacts, solContractPath, '/');
|
|
310
312
|
if (await Directory.existsAsync(outputDir) === false) {
|
|
313
|
+
let content = await this.getSolFileContent(solContractPath, options);
|
|
314
|
+
if (rgx_CONTRACT_NAME.test(content) === false) {
|
|
315
|
+
return null;
|
|
316
|
+
}
|
|
311
317
|
throw new Error(`No JSONs found in ${outputDir} for ${solContractPath}`);
|
|
312
318
|
}
|
|
313
319
|
if (options.contractName != null) {
|
|
@@ -326,7 +332,6 @@ export class HardhatProvider {
|
|
|
326
332
|
if (filename == null) {
|
|
327
333
|
throw new Error(`Filename not extracted from ${solContractPath}`);
|
|
328
334
|
}
|
|
329
|
-
// Filename could contain random number, extract main-name
|
|
330
335
|
let files = await Directory.readFilesAsync(outputDir);
|
|
331
336
|
let jsons = files.filter(x => /(?<!dbg)\.json$/.test(x.uri.file));
|
|
332
337
|
if (jsons.length === 0) {
|
|
@@ -339,22 +344,15 @@ export class HardhatProvider {
|
|
|
339
344
|
}
|
|
340
345
|
let jsonFile = getJsonFile(jsons, filename);
|
|
341
346
|
if (jsonFile == null) {
|
|
347
|
+
// Filename could contain random number, extract main-name
|
|
342
348
|
const filenameRndSuffix = filename.replace(/_\d+$/, '');
|
|
343
349
|
if (filenameRndSuffix != null) {
|
|
344
350
|
jsonFile = getJsonFile(jsons, filenameRndSuffix);
|
|
345
351
|
}
|
|
346
352
|
}
|
|
347
353
|
if (jsonFile == null) {
|
|
348
|
-
let
|
|
349
|
-
|
|
350
|
-
sourceFile = class_Uri.combine(options.paths.root, sourceFile);
|
|
351
|
-
}
|
|
352
|
-
if (await File.existsAsync(sourceFile) === false) {
|
|
353
|
-
throw new Error(`Source file "${solContractPath}" not found in ${options.paths.root}`);
|
|
354
|
-
}
|
|
355
|
-
let source = await File.readAsync(sourceFile);
|
|
356
|
-
let rgx = /contract \s*(?<contractName>[\w_]+)/ig;
|
|
357
|
-
let matches = Array.from(source.matchAll(rgx));
|
|
354
|
+
let source = await this.getSolFileContent(solContractPath, options);
|
|
355
|
+
let matches = Array.from(source.matchAll(rgx_CONTRACT_NAME));
|
|
358
356
|
let contractName = matches[matches.length - 1]?.groups?.contractName;
|
|
359
357
|
options.contractName = contractName;
|
|
360
358
|
jsonFile = getJsonFile(jsons, contractName);
|
|
@@ -382,6 +380,17 @@ export class HardhatProvider {
|
|
|
382
380
|
}
|
|
383
381
|
return { root, artifacts };
|
|
384
382
|
}
|
|
383
|
+
async getSolFileContent(solContractPath, options) {
|
|
384
|
+
let sourceFile = solContractPath;
|
|
385
|
+
if (await File.existsAsync(sourceFile) === false) {
|
|
386
|
+
sourceFile = class_Uri.combine(options.paths.root, sourceFile);
|
|
387
|
+
}
|
|
388
|
+
if (await File.existsAsync(sourceFile) === false) {
|
|
389
|
+
throw new Error(`Source file "${solContractPath}" not found in ${options.paths.root}`);
|
|
390
|
+
}
|
|
391
|
+
let source = await File.readAsync(sourceFile);
|
|
392
|
+
return source;
|
|
393
|
+
}
|
|
385
394
|
async getContractFromSolPath(solContractPath, options) {
|
|
386
395
|
let { root, artifacts } = await this.getPaths(options?.paths);
|
|
387
396
|
let solContractPathRootRelative = $path.getRelativePath(solContractPath, root);
|
|
@@ -392,6 +401,9 @@ export class HardhatProvider {
|
|
|
392
401
|
artifacts,
|
|
393
402
|
},
|
|
394
403
|
});
|
|
404
|
+
if (artifactJsonPath == null) {
|
|
405
|
+
return null;
|
|
406
|
+
}
|
|
395
407
|
let { abi, bytecode, contractName, linkReferences } = await File.readAsync(artifactJsonPath);
|
|
396
408
|
let { contract, ContractCtor } = ContractClassFactory.fromAbi(null, abi, null, null, {
|
|
397
409
|
contractName,
|
|
@@ -401,7 +413,9 @@ export class HardhatProvider {
|
|
|
401
413
|
artifact: artifactJsonPath
|
|
402
414
|
}
|
|
403
415
|
});
|
|
404
|
-
let files =
|
|
416
|
+
let files = options?.paths?.sources
|
|
417
|
+
? await Directory.readFilesAsync(options.paths.sources, '*.sol')
|
|
418
|
+
: [];
|
|
405
419
|
let fileMap = await alot(files)
|
|
406
420
|
.mapAsync(async (file) => {
|
|
407
421
|
return {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { TAddress } from '../../models/TAddress';
|
|
2
|
-
import type { EnsPublicResolver } from '
|
|
3
|
-
import type { EnsRegistry } from '
|
|
2
|
+
import type { EnsPublicResolver } from '../../prebuilt/ens/EnsPublicResolver/EnsPublicResolver';
|
|
3
|
+
import type { EnsRegistry } from '../../prebuilt/ens/EnsRegistry/EnsRegistry';
|
|
4
4
|
import { TEth } from '../../models/TEth';
|
|
5
5
|
import { Web3Client } from '../../clients/Web3Client';
|
|
6
6
|
import { TPlatform } from '../../models/TPlatform';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GnosisSafeFactory.js","sourceRoot":"","sources":["../../../src/safe/GnosisSafeFactory.ts"],"names":[],"mappings":";;;AAGA,2DAAwD;AACxD,
|
|
1
|
+
{"version":3,"file":"GnosisSafeFactory.js","sourceRoot":"","sources":["../../../src/safe/GnosisSafeFactory.ts"],"names":[],"mappings":";;;AAGA,2DAAwD;AACxD,uDAAoD;AACpD,oDAAiD;AACjD,uDAAoD;AACpD,+EAA4E;AAK5E,2FAA2F;AAE3F,qDAAqD;AACxC,QAAA,wBAAwB,GAAG,oEAAoE,CAAC;AAG7G,MAAsB,iBAAiB;IAEnC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAE,KAAgB,EAAE,MAAkB,EAAE,MAM1D;QAEG,MAAM,iBAAiB,GAAsB;YAC3C,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,SAAS,EAAE,MAAM,CAAC,SAAS,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM;SACpD,CAAC;QAEF,MAAM,GAAG,GAAG,MAAM,CAAC,SAAS,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,eAAM,CAAC,IAAI,EAAE,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAC3F,mBAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,yBAAyB,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;QAElE,MAAM,YAAY,GAAG,IAAI,WAAI,CAAC,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC9D,MAAM,mBAAmB,GAAG,IAAI,mCAAgB,CAAC,GAAG,CAAC,gBAAgB,EAAE,MAAM,CAAC,CAAC;QAE/E,MAAM,SAAS,GAAG,MAAM,YAAY,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,KAAK,EAChD,MAAM,CAAC,MAAM,EACb,MAAM,CAAC,MAAM,CAAC,SAAS,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,EAChD,IAAI,EAAE,KAAK;QACX,IAAI,EAAE,OAAO;QACb,IAAI,EAAE,kBAAkB;QACxB,IAAI,EAAE,eAAe;QACrB,IAAI,EAAE,UAAU;QAChB,IAAI,CACX,CAAC;QAGF,IAAI,EAAE,GAAG,MAAM,mBAAmB,CAAC,oBAAoB,CAAC,KAAK,EACzD,YAAY,CAAC,OAAO,EAAE,cAAc;QACpC,SAAS,CAAC,IAAI,EAAE,eAAe;QAC/B,MAAM,CAAC,MAAM,CAAC,SAAS,IAAI,CAAC,MAAM,CAAC,gCAAwB,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CACtF,CAAC;QACF,IAAI,OAAO,GAAG,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC;QAE9B,IAAI,IAAI,GAAG,mBAAmB,CAAC,wBAAwB,CAAC,OAAO,CAAC,CAAC;QAEjE,mBAAQ,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,uCAAwC,IAAI,CAAC,MAAO,oBAAqB,OAAO,CAAC,eAAgB,GAAG,CAAC,CAAC;QAClI,IAAI,CAAE,GAAG,CAAE,GAAG,IAAI,CAAC;QAEnB,MAAM,IAAI,GAAG,IAAI,qCAAiB,CAAC;YAC/B,WAAW,EAAE,GAAG,CAAC,MAAM,CAAC,KAAK;YAC7B,MAAM,EAAE,CAAE,KAAK,CAAE;YACjB,MAAM,EAAE,MAAM;SACjB,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ;AApDD,8CAoDC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GnosisSafeService.js","sourceRoot":"","sources":["../../../src/safe/GnosisSafeService.ts"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"GnosisSafeService.js","sourceRoot":"","sources":["../../../src/safe/GnosisSafeService.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SafeTx.js","sourceRoot":"","sources":["../../../src/safe/SafeTx.ts"],"names":[],"mappings":";;;AAGA,2DAAwD;AACxD,uDAAoD;AACpD,qDAAkD;AAClD,yDAAsD;AACtD,+DAA4D;AAC5D,oDAAiD;AACjD,
|
|
1
|
+
{"version":3,"file":"SafeTx.js","sourceRoot":"","sources":["../../../src/safe/SafeTx.ts"],"names":[],"mappings":"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"}
|