dequanto 0.1.86 → 0.1.89
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/contracts/ContractWriter.js +2 -2
- package/lib/cjs/contracts/ContractWriter.js.map +1 -1
- package/lib/cjs/contracts/deploy/Deployments.js +1 -1
- package/lib/cjs/contracts/deploy/Deployments.js.map +1 -1
- package/lib/cjs/contracts/deploy/proxy/$proxyDeploy.js +13 -14
- package/lib/cjs/contracts/deploy/proxy/$proxyDeploy.js.map +1 -1
- package/lib/cjs/txs/TxWriter.js +19 -7
- package/lib/cjs/txs/TxWriter.js.map +1 -1
- package/lib/cjs/txs/agents/BatchAgent.js +83 -0
- package/lib/cjs/txs/agents/BatchAgent.js.map +1 -0
- package/lib/cjs/txs/agents/TxWriterAccountAgents.js.map +1 -1
- package/lib/esm/contracts/ContractWriter.js.map +1 -1
- package/lib/esm/contracts/ContractWriter.mjs +2 -2
- package/lib/esm/contracts/deploy/Deployments.js.map +1 -1
- package/lib/esm/contracts/deploy/Deployments.mjs +1 -1
- package/lib/esm/contracts/deploy/proxy/$proxyDeploy.js.map +1 -1
- package/lib/esm/contracts/deploy/proxy/$proxyDeploy.mjs +13 -14
- package/lib/esm/txs/TxWriter.js.map +1 -1
- package/lib/esm/txs/TxWriter.mjs +19 -7
- package/lib/esm/txs/agents/BatchAgent.js.map +1 -0
- package/lib/esm/txs/agents/BatchAgent.mjs +78 -0
- package/lib/esm/txs/agents/TxWriterAccountAgents.js.map +1 -1
- package/lib/types/contracts/deploy/Deployments.d.ts +2 -0
- package/lib/types/txs/TxWriter.d.ts +6 -0
- package/lib/types/txs/agents/BatchAgent.d.ts +27 -0
- package/lib/types/txs/agents/TxWriterAccountAgents.d.ts +4 -2
- package/package.json +1 -1
- package/src/contracts/ContractWriter.ts +2 -2
- package/src/contracts/deploy/Deployments.ts +4 -1
- package/src/contracts/deploy/proxy/$proxyDeploy.ts +13 -13
- package/src/txs/TxWriter.ts +27 -9
- package/src/txs/agents/BatchAgent.ts +112 -0
- package/src/txs/agents/TxWriterAccountAgents.ts +4 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"$proxyDeploy.js","sourceRoot":"","sources":["../../../../../src/contracts/deploy/proxy/$proxyDeploy.ts"],"names":[],"mappings":";;;;;;AAAA,gEAA6D;AAE7D,4DAAyD;AACzD,uDAAoD;AACpD,gDAAwB;AAExB,IAAiB,YAAY,CAiT5B;AAjTD,WAAiB,YAAY;IAClB,KAAK,UAAU,oBAAoB,CAAE,OAA6B,EAAE,OAA6B;QAMpG,IAAI,MAAM,GAAG,MAAM,yBAAyB,CAAC,OAAO,EAAE,OAAO,EAAE;YAC3D,kBAAkB,EAAE,IAAI;SAC3B,CAAC,CAAC;QACH,IAAI,MAAM,EAAE;YACR,IAAI,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACvG,OAAO;gBACH,QAAQ,EAAE,MAAM,CAAC,MAAM;gBACvB,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC;gBAClD,SAAS,EAAE,MAAM,CAAC,SAAS;gBAC3B,OAAO,EAAE,GAAG,MAAM,CAAC,IAAI,cAAc,aAAa,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,aAAa,MAAM,CAAC,MAAM,CAAC,IAAI,cAAc,SAAS,EAAE;aAClK,CAAC;SACL;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAnBqB,iCAAoB,uBAmBzC,CAAA;IAGD,KAAK,UAAU,yBAAyB,CACpC,OAA6B,EAC3B,OAA6B,EAC7B,GAAU;QAEZ,GAAG,KAAK,EAAE,CAAC;QAEX,IAAI,MAAM,GAAG,
|
|
1
|
+
{"version":3,"file":"$proxyDeploy.js","sourceRoot":"","sources":["../../../../../src/contracts/deploy/proxy/$proxyDeploy.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,7 +22,9 @@ export var $proxyDeploy;
|
|
|
22
22
|
$proxyDeploy.compareStorageLayout = compareStorageLayout;
|
|
23
23
|
async function compareStorageLayoutInner(oldVars, newVars, ctx) {
|
|
24
24
|
ctx ??= {};
|
|
25
|
-
|
|
25
|
+
// When resolving state variables
|
|
26
|
+
// we append '$' char(s) to the overriden variables to avoid name conflicts, so here we check also for __gap with possible $ sfx.
|
|
27
|
+
let rgxGap = /^_+gap\$*$/;
|
|
26
28
|
let oldMemory = oldVars.map(getMemoryPosition);
|
|
27
29
|
let oldLastSlot = alot(oldVars).max(x => x.slot);
|
|
28
30
|
for (let i = 0; i < newVars.length; i++) {
|
|
@@ -35,29 +37,26 @@ export var $proxyDeploy;
|
|
|
35
37
|
// Find the new variable name in old storage
|
|
36
38
|
// Exclude those with the same position, as they might be pushed logically down by __gap pattern
|
|
37
39
|
let oldVarWithName = oldVars.find(x => x.name === newVar.name);
|
|
38
|
-
if (oldVarWithName != null && !Variables.
|
|
40
|
+
if (oldVarWithName != null && !Variables.eqLocation(oldVarWithName, newVar) && !rgxGap.test(newVar.name)) {
|
|
39
41
|
return new BaseError(ELayoutError.NAME_MISMATCH, newVar, [oldVarWithName], ctx);
|
|
40
42
|
}
|
|
41
43
|
continue;
|
|
42
44
|
}
|
|
43
|
-
if (rgxGap.test(newVar.name)) {
|
|
44
|
-
continue;
|
|
45
|
-
}
|
|
46
45
|
let isLastVariable = newVar.slot === oldLastSlot;
|
|
47
|
-
let
|
|
48
|
-
if (
|
|
49
|
-
if (
|
|
46
|
+
let oldVarAtSamePos = oldVars.find(x => x.slot === newVar.slot && x.position === newVar.position);
|
|
47
|
+
if (oldVarAtSamePos != null) {
|
|
48
|
+
if (oldVarAtSamePos.type === newVar.type) {
|
|
50
49
|
// New variable is the same
|
|
51
|
-
if (
|
|
50
|
+
if (oldVarAtSamePos.name !== newVar.name) {
|
|
52
51
|
let oldVarWithName = oldVars.find(x => x.name === newVar.name);
|
|
53
52
|
if (oldVarWithName != null) {
|
|
54
|
-
return new BaseError(ELayoutError.NAME_MISMATCH, newVar, [
|
|
53
|
+
return new BaseError(ELayoutError.NAME_MISMATCH, newVar, [oldVarAtSamePos, oldVarWithName], ctx);
|
|
55
54
|
}
|
|
56
55
|
}
|
|
57
56
|
continue;
|
|
58
57
|
}
|
|
59
58
|
if (isDynamicVariable(newVar)) {
|
|
60
|
-
let error = await Variables.compare(
|
|
59
|
+
let error = await Variables.compare(oldVarAtSamePos, newVar, ctx);
|
|
61
60
|
if (error != null) {
|
|
62
61
|
return error;
|
|
63
62
|
}
|
|
@@ -69,7 +68,7 @@ export var $proxyDeploy;
|
|
|
69
68
|
if (current.offset + current.length <= mem.offset) {
|
|
70
69
|
return false;
|
|
71
70
|
}
|
|
72
|
-
if (current.offset
|
|
71
|
+
if (current.offset >= mem.offset + mem.length) {
|
|
73
72
|
return false;
|
|
74
73
|
}
|
|
75
74
|
return true;
|
|
@@ -96,10 +95,10 @@ export var $proxyDeploy;
|
|
|
96
95
|
}
|
|
97
96
|
let Variables;
|
|
98
97
|
(function (Variables) {
|
|
99
|
-
function
|
|
98
|
+
function eqLocation(a, b) {
|
|
100
99
|
return a.slot === b.slot && a.position === b.position;
|
|
101
100
|
}
|
|
102
|
-
Variables.
|
|
101
|
+
Variables.eqLocation = eqLocation;
|
|
103
102
|
;
|
|
104
103
|
async function compare(oldVar, newVar, ctx) {
|
|
105
104
|
if ($types.isDynamicArray(newVar.type)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TxWriter.js","sourceRoot":"","sources":["../../../src/txs/TxWriter.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"TxWriter.js","sourceRoot":"","sources":["../../../src/txs/TxWriter.ts"],"names":[],"mappings":"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"}
|
package/lib/esm/txs/TxWriter.mjs
CHANGED
|
@@ -83,22 +83,31 @@ export class TxWriter extends class_EventEmitter {
|
|
|
83
83
|
await this.saveTxAndExit();
|
|
84
84
|
return;
|
|
85
85
|
}
|
|
86
|
-
let
|
|
87
|
-
|
|
88
|
-
|
|
86
|
+
let sender = await this.getSender();
|
|
87
|
+
let globalAgent = DEFAULTS.agent;
|
|
88
|
+
let accountAgent = TxWriterAccountAgents.get(this.account);
|
|
89
|
+
if (globalAgent != null || accountAgent != null) {
|
|
89
90
|
let innerWriter;
|
|
90
91
|
try {
|
|
91
|
-
|
|
92
|
+
if (globalAgent != null) {
|
|
93
|
+
// Try global agent first
|
|
94
|
+
innerWriter = await globalAgent.process(sender, this.account, this);
|
|
95
|
+
}
|
|
96
|
+
if (innerWriter == null && accountAgent != null) {
|
|
97
|
+
// If not processed by global agent, try account agent
|
|
98
|
+
innerWriter = await accountAgent.process(sender, this.account, this);
|
|
99
|
+
}
|
|
92
100
|
}
|
|
93
101
|
catch (error) {
|
|
94
102
|
this.onCompleted.reject(error);
|
|
95
103
|
return;
|
|
96
104
|
}
|
|
97
|
-
|
|
98
|
-
|
|
105
|
+
if (innerWriter != null) {
|
|
106
|
+
this.pipeInnerWriter(innerWriter);
|
|
107
|
+
return;
|
|
108
|
+
}
|
|
99
109
|
}
|
|
100
110
|
let time = Date.now();
|
|
101
|
-
let sender = await this.getSender();
|
|
102
111
|
try {
|
|
103
112
|
await Promise.all([
|
|
104
113
|
this.builder.ensureNonce(),
|
|
@@ -470,6 +479,9 @@ export class TxWriter extends class_EventEmitter {
|
|
|
470
479
|
}
|
|
471
480
|
throw new Error(`Account ${account} not found`);
|
|
472
481
|
}
|
|
482
|
+
static async hasAgent(account) {
|
|
483
|
+
return DEFAULTS.agent != null || TxWriterAccountAgents.get(account) != null;
|
|
484
|
+
}
|
|
473
485
|
static defaultOptions(options) {
|
|
474
486
|
obj_extend(DEFAULTS, options);
|
|
475
487
|
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"BatchAgent.js","sourceRoot":"","sources":["../../../../src/txs/agents/BatchAgent.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,78 @@
|
|
|
1
|
+
import { ChainAccountService } from '../../ChainAccountService.mjs';
|
|
2
|
+
import { class_Dfr, class_EventEmitter } from 'atma-utils';
|
|
3
|
+
import { $date } from '../../utils/$date.mjs';
|
|
4
|
+
import { $require } from '../../utils/$require.mjs';
|
|
5
|
+
import { $address } from '../../utils/$address.mjs';
|
|
6
|
+
export class BatchAgent {
|
|
7
|
+
constructor(options) {
|
|
8
|
+
this.options = options;
|
|
9
|
+
this.transactions = [];
|
|
10
|
+
}
|
|
11
|
+
getTxData() {
|
|
12
|
+
return this.transactions.map(tx => {
|
|
13
|
+
let data = tx.outerWriter.builder.getTxData();
|
|
14
|
+
return {
|
|
15
|
+
to: data.to,
|
|
16
|
+
value: data.value,
|
|
17
|
+
data: data.data,
|
|
18
|
+
};
|
|
19
|
+
});
|
|
20
|
+
}
|
|
21
|
+
async process(senderMix, account, outerWriter) {
|
|
22
|
+
if (outerWriter.builder.data.to == null && this.options?.ignoreContractCreation != false) {
|
|
23
|
+
return null;
|
|
24
|
+
}
|
|
25
|
+
let sender = typeof senderMix === 'string'
|
|
26
|
+
? await ChainAccountService.get(senderMix)
|
|
27
|
+
: senderMix;
|
|
28
|
+
let inner = new MockTxWriter(sender, account, outerWriter);
|
|
29
|
+
this.transactions.forEach(tx => {
|
|
30
|
+
$require.eq(sender.address, tx.sender.address, `Expected the same SENDER for all batch transactions`);
|
|
31
|
+
$require.eq(sender.address, tx.sender.address, `Expected the same ACCOUNT for all batch transactions`);
|
|
32
|
+
});
|
|
33
|
+
this.transactions.push(inner);
|
|
34
|
+
await inner.process();
|
|
35
|
+
return inner;
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
export class MockTxWriter extends class_EventEmitter {
|
|
39
|
+
constructor(sender, account, outerWriter) {
|
|
40
|
+
super();
|
|
41
|
+
this.sender = sender;
|
|
42
|
+
this.account = account;
|
|
43
|
+
this.outerWriter = outerWriter;
|
|
44
|
+
this.onSent = new class_Dfr();
|
|
45
|
+
this.onCompleted = new class_Dfr();
|
|
46
|
+
}
|
|
47
|
+
async process() {
|
|
48
|
+
let receipt = {
|
|
49
|
+
status: 1,
|
|
50
|
+
transactionHash: '0x',
|
|
51
|
+
transactionIndex: 0n,
|
|
52
|
+
blockHash: '0x',
|
|
53
|
+
blockNumber: 0,
|
|
54
|
+
from: $address.ZERO,
|
|
55
|
+
to: $address.ZERO,
|
|
56
|
+
cumulativeGasUsed: 0n,
|
|
57
|
+
gasUsed: 0n,
|
|
58
|
+
effectiveGasPrice: 0n,
|
|
59
|
+
logs: [],
|
|
60
|
+
logsBloom: '0x'
|
|
61
|
+
};
|
|
62
|
+
let tx = {
|
|
63
|
+
timestamp: $date.toUnixTimestamp(),
|
|
64
|
+
confirmations: 5,
|
|
65
|
+
hash: '0x',
|
|
66
|
+
receipt: receipt,
|
|
67
|
+
error: null,
|
|
68
|
+
knownLogs: null,
|
|
69
|
+
};
|
|
70
|
+
this.tx = tx;
|
|
71
|
+
this.emit('transactionHash', receipt.transactionHash);
|
|
72
|
+
this.emit('receipt', receipt);
|
|
73
|
+
this.onCompleted.resolve(receipt);
|
|
74
|
+
return this;
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
//# sourceMappingURL=BatchAgent.js.map
|
|
78
|
+
//# sourceMappingURL=BatchAgent.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TxWriterAccountAgents.js","sourceRoot":"","sources":["../../../../src/txs/agents/TxWriterAccountAgents.ts"],"names":[],"mappings":";;;AAEA,2CAAwC;AACxC,iDAA8C;AAC9C,mDAAgD;
|
|
1
|
+
{"version":3,"file":"TxWriterAccountAgents.js","sourceRoot":"","sources":["../../../../src/txs/agents/TxWriterAccountAgents.ts"],"names":[],"mappings":";;;AAEA,2CAAwC;AACxC,iDAA8C;AAC9C,mDAAgD;AAWhD,IAAiB,qBAAqB,CAerC;AAfD,WAAiB,qBAAqB;IAElC,MAAM,MAAM,GAA4B;QACpC,IAAI,qBAAS,EAAE;QACf,IAAI,2BAAY,EAAE;QAClB,IAAI,6BAAa,EAAE;KACtB,CAAC;IAEF,SAAgB,QAAQ,CAAE,KAA4B;QAClD,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACvB,CAAC;IAFe,8BAAQ,WAEvB,CAAA;IAED,SAAgB,GAAG,CAAE,OAAiB;QAClC,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;IACzD,CAAC;IAFe,yBAAG,MAElB,CAAA;AACL,CAAC,EAfgB,qBAAqB,GAArB,6BAAqB,KAArB,6BAAqB,QAerC"}
|
|
@@ -38,6 +38,7 @@ export declare class Deployments {
|
|
|
38
38
|
verification?: boolean;
|
|
39
39
|
checkBytecode?: boolean;
|
|
40
40
|
whenBytecodeChanged?: 'redeploy' | 'ignore' | 'throw';
|
|
41
|
+
whenUpgradeRequired?: 'ignore';
|
|
41
42
|
};
|
|
42
43
|
store: DeploymentsStorage;
|
|
43
44
|
private _logger;
|
|
@@ -58,6 +59,7 @@ export declare class Deployments {
|
|
|
58
59
|
verification?: boolean;
|
|
59
60
|
checkBytecode?: boolean;
|
|
60
61
|
whenBytecodeChanged?: 'redeploy' | 'ignore' | 'throw';
|
|
62
|
+
whenUpgradeRequired?: 'ignore';
|
|
61
63
|
});
|
|
62
64
|
has<T extends ContractBase>(Ctor: Constructor<T>, opts?: {
|
|
63
65
|
id?: string;
|
|
@@ -9,6 +9,7 @@ import { ITxLogItem } from './receipt/ITxLogItem';
|
|
|
9
9
|
import { ISafeServiceTransport } from '../safe/transport/ISafeServiceTransport';
|
|
10
10
|
import { TEth } from '../models/TEth';
|
|
11
11
|
import { SafeServiceTypes } from '../safe/types/SafeServiceTypes';
|
|
12
|
+
import { ITxWriterAgent } from './agents/TxWriterAccountAgents';
|
|
12
13
|
export interface ITxWriterEvents {
|
|
13
14
|
transactionHash(hash: TEth.Hex): any;
|
|
14
15
|
receipt(receipt: TEth.TxReceipt): any;
|
|
@@ -62,6 +63,10 @@ export interface ITxWriterOptions {
|
|
|
62
63
|
* Do not log Transaction states (start, receipt, etc)
|
|
63
64
|
*/
|
|
64
65
|
silent?: boolean;
|
|
66
|
+
/**
|
|
67
|
+
* Custom agent to process the transaction data.
|
|
68
|
+
*/
|
|
69
|
+
agent?: ITxWriterAgent;
|
|
65
70
|
}
|
|
66
71
|
export declare class TxWriter extends class_EventEmitter<ITxWriterEvents> implements ITxWriterEmitter {
|
|
67
72
|
client: Web3Client;
|
|
@@ -103,6 +108,7 @@ export declare class TxWriter extends class_EventEmitter<ITxWriterEvents> implem
|
|
|
103
108
|
static create(client: Web3Client, builder: TxDataBuilder, account: TAccount, options?: ITxWriterOptions): TxWriter;
|
|
104
109
|
static writeTxData(client: Web3Client, data: Partial<TEth.TxLike>, accountMix: TAccount, options?: ITxWriterOptions): Promise<TxWriter>;
|
|
105
110
|
static prepareAccount(account: TAccount): Promise<IAccount>;
|
|
111
|
+
static hasAgent(account: IAccount): Promise<boolean>;
|
|
106
112
|
static defaultOptions(options: ITxWriterOptions): void;
|
|
107
113
|
static DEFAULTS: ITxWriterOptions;
|
|
108
114
|
}
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
import { EoAccount } from '../../models/TAccount';
|
|
2
|
+
import { ITxWriterAgent } from './TxWriterAccountAgents';
|
|
3
|
+
import { ITxWriterEmitter, ITxWriterEvents, ITxWriterTransaction, TxWriter } from '../TxWriter';
|
|
4
|
+
import { class_Dfr, class_EventEmitter } from 'atma-utils';
|
|
5
|
+
import { TEth } from '../../models/TEth';
|
|
6
|
+
export declare class BatchAgent implements ITxWriterAgent {
|
|
7
|
+
options?: {
|
|
8
|
+
ignoreContractCreation?: boolean;
|
|
9
|
+
};
|
|
10
|
+
transactions: MockTxWriter[];
|
|
11
|
+
constructor(options?: {
|
|
12
|
+
ignoreContractCreation?: boolean;
|
|
13
|
+
});
|
|
14
|
+
getTxData(): Pick<TEth.TxLike, "to" | "data" | "value">[];
|
|
15
|
+
process(senderMix: string | EoAccount, account: TEth.IAccount, outerWriter: TxWriter): Promise<MockTxWriter>;
|
|
16
|
+
}
|
|
17
|
+
export declare class MockTxWriter extends class_EventEmitter<ITxWriterEvents> implements ITxWriterEmitter {
|
|
18
|
+
sender: TEth.IAccount;
|
|
19
|
+
account: TEth.IAccount;
|
|
20
|
+
outerWriter: TxWriter;
|
|
21
|
+
onSent: class_Dfr<string>;
|
|
22
|
+
onCompleted: class_Dfr<TEth.TxReceipt>;
|
|
23
|
+
receipt: TEth.TxReceipt;
|
|
24
|
+
tx: ITxWriterTransaction;
|
|
25
|
+
constructor(sender: TEth.IAccount, account: TEth.IAccount, outerWriter: TxWriter);
|
|
26
|
+
process(): Promise<this>;
|
|
27
|
+
}
|
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
import type { EoAccount, TAccount } from '../../models/TAccount';
|
|
2
2
|
import type { ITxWriterEmitter, TxWriter } from '../TxWriter';
|
|
3
|
-
export interface
|
|
4
|
-
supports(account: TAccount): boolean;
|
|
3
|
+
export interface ITxWriterAgent {
|
|
5
4
|
process(sender: EoAccount, account: TAccount, outerWriter: TxWriter): Promise<ITxWriterEmitter>;
|
|
6
5
|
}
|
|
6
|
+
export interface ITxWriterAccountAgent extends ITxWriterAgent {
|
|
7
|
+
supports(account: TAccount): boolean;
|
|
8
|
+
}
|
|
7
9
|
export declare namespace TxWriterAccountAgents {
|
|
8
10
|
function register(agent: ITxWriterAccountAgent): void;
|
|
9
11
|
function get(account: TAccount): ITxWriterAccountAgent;
|
package/package.json
CHANGED
|
@@ -80,7 +80,7 @@ export class ContractWriter implements IContractWriter {
|
|
|
80
80
|
? account.value
|
|
81
81
|
: null;
|
|
82
82
|
|
|
83
|
-
let
|
|
83
|
+
let hasAgent = await TxWriter.hasAgent(account);
|
|
84
84
|
let sender = $account.getSender(account);
|
|
85
85
|
|
|
86
86
|
let txBuilder = new TxDataBuilder(this.client, sender, {
|
|
@@ -101,7 +101,7 @@ export class ContractWriter implements IContractWriter {
|
|
|
101
101
|
txBuilder.setInputDataWithABI(abi, ...params);
|
|
102
102
|
txBuilder.abi = configs?.abi;
|
|
103
103
|
|
|
104
|
-
if (
|
|
104
|
+
if (hasAgent !== true) {
|
|
105
105
|
await Promise.all([
|
|
106
106
|
txBuilder.setGas({
|
|
107
107
|
price: builderConfig.gasPrice,
|
|
@@ -99,6 +99,9 @@ export class Deployments {
|
|
|
99
99
|
// default 'redeploy'
|
|
100
100
|
whenBytecodeChanged?: 'redeploy' | 'ignore' | 'throw'
|
|
101
101
|
|
|
102
|
+
// default: upgrade proxy implementation, when ignored, the upgrade is omitted and can be executed later
|
|
103
|
+
whenUpgradeRequired?: 'ignore'
|
|
104
|
+
|
|
102
105
|
} = {}) {
|
|
103
106
|
this._config.TransparentProxy.Proxy = opts?.Proxy;
|
|
104
107
|
this._config.TransparentProxy.ProxyAdmin = opts?.ProxyAdmin;
|
|
@@ -336,7 +339,7 @@ export class Deployments {
|
|
|
336
339
|
address: implementationAddress,
|
|
337
340
|
initData: data
|
|
338
341
|
},
|
|
339
|
-
upgradeImplementation: opts.deployment?.upgradeProxy ??
|
|
342
|
+
upgradeImplementation: opts.deployment?.upgradeProxy ?? this.opts?.whenUpgradeRequired !== 'ignore'
|
|
340
343
|
})
|
|
341
344
|
|
|
342
345
|
if (contractImplDeployment.implementation == null) {
|
|
@@ -34,7 +34,9 @@ export namespace $proxyDeploy {
|
|
|
34
34
|
|
|
35
35
|
ctx ??= {};
|
|
36
36
|
|
|
37
|
-
|
|
37
|
+
// When resolving state variables
|
|
38
|
+
// we append '$' char(s) to the overriden variables to avoid name conflicts, so here we check also for __gap with possible $ sfx.
|
|
39
|
+
let rgxGap = /^_+gap\$*$/;
|
|
38
40
|
let oldMemory = oldVars.map(getMemoryPosition);
|
|
39
41
|
let oldLastSlot = alot(oldVars).max(x => x.slot);
|
|
40
42
|
for (let i = 0; i < newVars.length; i++) {
|
|
@@ -53,7 +55,7 @@ export namespace $proxyDeploy {
|
|
|
53
55
|
// Find the new variable name in old storage
|
|
54
56
|
// Exclude those with the same position, as they might be pushed logically down by __gap pattern
|
|
55
57
|
let oldVarWithName = oldVars.find(x => x.name === newVar.name);
|
|
56
|
-
if (oldVarWithName != null && !Variables.
|
|
58
|
+
if (oldVarWithName != null && !Variables.eqLocation(oldVarWithName, newVar) && !rgxGap.test(newVar.name)) {
|
|
57
59
|
return new BaseError(
|
|
58
60
|
ELayoutError.NAME_MISMATCH,
|
|
59
61
|
newVar,
|
|
@@ -63,21 +65,18 @@ export namespace $proxyDeploy {
|
|
|
63
65
|
}
|
|
64
66
|
continue;
|
|
65
67
|
}
|
|
66
|
-
if (rgxGap.test(newVar.name)) {
|
|
67
|
-
continue;
|
|
68
|
-
}
|
|
69
68
|
let isLastVariable = newVar.slot === oldLastSlot;
|
|
70
|
-
let
|
|
71
|
-
if (
|
|
72
|
-
if (
|
|
69
|
+
let oldVarAtSamePos = oldVars.find(x => x.slot === newVar.slot && x.position === newVar.position);
|
|
70
|
+
if (oldVarAtSamePos != null) {
|
|
71
|
+
if (oldVarAtSamePos.type === newVar.type) {
|
|
73
72
|
// New variable is the same
|
|
74
|
-
if (
|
|
73
|
+
if (oldVarAtSamePos.name !== newVar.name) {
|
|
75
74
|
let oldVarWithName = oldVars.find(x => x.name === newVar.name);
|
|
76
75
|
if (oldVarWithName != null) {
|
|
77
76
|
return new BaseError(
|
|
78
77
|
ELayoutError.NAME_MISMATCH,
|
|
79
78
|
newVar,
|
|
80
|
-
[
|
|
79
|
+
[oldVarAtSamePos, oldVarWithName],
|
|
81
80
|
ctx
|
|
82
81
|
);
|
|
83
82
|
}
|
|
@@ -85,7 +84,7 @@ export namespace $proxyDeploy {
|
|
|
85
84
|
continue;
|
|
86
85
|
}
|
|
87
86
|
if (isDynamicVariable(newVar)) {
|
|
88
|
-
let error = await Variables.compare(
|
|
87
|
+
let error = await Variables.compare(oldVarAtSamePos, newVar, ctx);
|
|
89
88
|
if (error != null) {
|
|
90
89
|
return error;
|
|
91
90
|
}
|
|
@@ -98,11 +97,12 @@ export namespace $proxyDeploy {
|
|
|
98
97
|
if (current.offset + current.length <= mem.offset) {
|
|
99
98
|
return false;
|
|
100
99
|
}
|
|
101
|
-
if (current.offset
|
|
100
|
+
if (current.offset >= mem.offset + mem.length) {
|
|
102
101
|
return false;
|
|
103
102
|
}
|
|
104
103
|
return true;
|
|
105
104
|
});
|
|
105
|
+
|
|
106
106
|
collisions = collisions.filter(x => {
|
|
107
107
|
return rgxGap.test(x.variable.name) === false;
|
|
108
108
|
});
|
|
@@ -132,7 +132,7 @@ export namespace $proxyDeploy {
|
|
|
132
132
|
|
|
133
133
|
|
|
134
134
|
namespace Variables {
|
|
135
|
-
export function
|
|
135
|
+
export function eqLocation (a: ISlotVarDefinition, b: ISlotVarDefinition) {
|
|
136
136
|
return a.slot === b.slot && a.position === b.position;
|
|
137
137
|
};
|
|
138
138
|
|
package/src/txs/TxWriter.ts
CHANGED
|
@@ -32,7 +32,7 @@ import { TEth } from '@dequanto/models/TEth';
|
|
|
32
32
|
import { SafeServiceTypes } from '@dequanto/safe/types/SafeServiceTypes';
|
|
33
33
|
import { ChainAccountService } from '@dequanto/ChainAccountService';
|
|
34
34
|
import { $is } from '@dequanto/utils/$is';
|
|
35
|
-
import { TxWriterAccountAgents } from './agents/TxWriterAccountAgents';
|
|
35
|
+
import { ITxWriterAccountAgent, ITxWriterAgent, TxWriterAccountAgents } from './agents/TxWriterAccountAgents';
|
|
36
36
|
|
|
37
37
|
|
|
38
38
|
|
|
@@ -97,6 +97,12 @@ export interface ITxWriterOptions {
|
|
|
97
97
|
* Do not log Transaction states (start, receipt, etc)
|
|
98
98
|
*/
|
|
99
99
|
silent?: boolean
|
|
100
|
+
|
|
101
|
+
|
|
102
|
+
/**
|
|
103
|
+
* Custom agent to process the transaction data.
|
|
104
|
+
*/
|
|
105
|
+
agent?: ITxWriterAgent
|
|
100
106
|
}
|
|
101
107
|
|
|
102
108
|
const DEFAULTS: ITxWriterOptions = {};
|
|
@@ -184,22 +190,30 @@ export class TxWriter extends class_EventEmitter<ITxWriterEvents> implements ITx
|
|
|
184
190
|
return;
|
|
185
191
|
}
|
|
186
192
|
|
|
187
|
-
let
|
|
188
|
-
|
|
189
|
-
|
|
193
|
+
let sender = await this.getSender();
|
|
194
|
+
let globalAgent = DEFAULTS.agent;
|
|
195
|
+
let accountAgent = TxWriterAccountAgents.get(this.account);
|
|
196
|
+
if (globalAgent != null || accountAgent != null) {
|
|
190
197
|
let innerWriter: ITxWriterEmitter;
|
|
191
198
|
try {
|
|
192
|
-
|
|
199
|
+
if (globalAgent != null) {
|
|
200
|
+
// Try global agent first
|
|
201
|
+
innerWriter = await globalAgent.process(sender, this.account, this);
|
|
202
|
+
}
|
|
203
|
+
if (innerWriter == null && accountAgent!= null) {
|
|
204
|
+
// If not processed by global agent, try account agent
|
|
205
|
+
innerWriter = await accountAgent.process(sender, this.account, this);
|
|
206
|
+
}
|
|
193
207
|
} catch (error) {
|
|
194
208
|
this.onCompleted.reject(error);
|
|
195
209
|
return;
|
|
196
210
|
}
|
|
197
|
-
|
|
198
|
-
|
|
211
|
+
if (innerWriter != null) {
|
|
212
|
+
this.pipeInnerWriter(innerWriter);
|
|
213
|
+
return;
|
|
214
|
+
}
|
|
199
215
|
}
|
|
200
|
-
|
|
201
216
|
let time = Date.now();
|
|
202
|
-
let sender: EoAccount = await this.getSender();
|
|
203
217
|
try {
|
|
204
218
|
await Promise.all([
|
|
205
219
|
this.builder.ensureNonce(),
|
|
@@ -636,6 +650,10 @@ export class TxWriter extends class_EventEmitter<ITxWriterEvents> implements ITx
|
|
|
636
650
|
throw new Error(`Account ${account} not found`);
|
|
637
651
|
}
|
|
638
652
|
|
|
653
|
+
static async hasAgent (account: IAccount): Promise<boolean> {
|
|
654
|
+
return DEFAULTS.agent != null || TxWriterAccountAgents.get(account) != null;
|
|
655
|
+
}
|
|
656
|
+
|
|
639
657
|
static defaultOptions (options: ITxWriterOptions) {
|
|
640
658
|
obj_extend(DEFAULTS, options);
|
|
641
659
|
}
|