@antseed/node 0.2.149 → 0.2.150
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.d.ts +10 -0
- package/dist/node.d.ts.map +1 -1
- package/dist/node.js +36 -51
- package/dist/node.js.map +1 -1
- package/dist/payments/evm/ants-token-client.d.ts.map +1 -1
- package/dist/payments/evm/ants-token-client.js +3 -6
- package/dist/payments/evm/ants-token-client.js.map +1 -1
- package/dist/payments/evm/emissions-client.d.ts.map +1 -1
- package/dist/payments/evm/emissions-client.js +1 -2
- package/dist/payments/evm/emissions-client.js.map +1 -1
- package/dist/payments/evm/identity-client.d.ts.map +1 -1
- package/dist/payments/evm/identity-client.js +2 -3
- package/dist/payments/evm/identity-client.js.map +1 -1
- package/dist/payments/seller-payment-manager.d.ts +9 -0
- package/dist/payments/seller-payment-manager.d.ts.map +1 -1
- package/dist/payments/seller-payment-manager.js +73 -8
- package/dist/payments/seller-payment-manager.js.map +1 -1
- package/package.json +3 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ants-token-client.d.ts","sourceRoot":"","sources":["../../../src/payments/evm/ants-token-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqC,KAAK,cAAc,EAAE,MAAM,QAAQ,CAAC;AAChF,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAErD,MAAM,WAAW,qBAAqB;IACpC,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAmBD,qBAAa,eAAgB,SAAQ,aAAa;gBACpC,MAAM,EAAE,qBAAqB;IAInC,SAAS,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAK3C,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAK1D,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC;IAK9B,gBAAgB,IAAI,OAAO,CAAC,OAAO,CAAC;IAKpC,WAAW,CAAC,MAAM,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"ants-token-client.d.ts","sourceRoot":"","sources":["../../../src/payments/evm/ants-token-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqC,KAAK,cAAc,EAAE,MAAM,QAAQ,CAAC;AAChF,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAErD,MAAM,WAAW,qBAAqB;IACpC,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAmBD,qBAAa,eAAgB,SAAQ,aAAa;gBACpC,MAAM,EAAE,qBAAqB;IAInC,SAAS,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAK3C,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAK1D,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC;IAK9B,gBAAgB,IAAI,OAAO,CAAC,OAAO,CAAC;IAKpC,WAAW,CAAC,MAAM,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAU7E,eAAe,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC;IAUxD,iBAAiB,CAAC,MAAM,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAS5E,qBAAqB,CAAC,eAAe,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAWlF,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAKpD,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC;IAKlC,4GAA4G;IACtG,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAKpD,OAAO,CAAC,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;CAGlF"}
|
|
@@ -40,8 +40,7 @@ export class ANTSTokenClient extends BaseEvmClient {
|
|
|
40
40
|
const connected = this._ensureConnected(signer);
|
|
41
41
|
const signerAddress = await connected.getAddress();
|
|
42
42
|
const contract = new Contract(this._contractAddress, ANTS_TOKEN_ABI, connected);
|
|
43
|
-
const
|
|
44
|
-
const tx = await contract.getFunction('setRegistry')(registryAddress, { nonce });
|
|
43
|
+
const tx = await this._sendWithNonce(signerAddress, (nonce) => contract.getFunction('setRegistry')(registryAddress, { nonce }));
|
|
45
44
|
const receipt = await tx.wait();
|
|
46
45
|
if (!receipt)
|
|
47
46
|
throw new Error('Transaction was dropped or replaced');
|
|
@@ -51,8 +50,7 @@ export class ANTSTokenClient extends BaseEvmClient {
|
|
|
51
50
|
const connected = this._ensureConnected(signer);
|
|
52
51
|
const signerAddress = await connected.getAddress();
|
|
53
52
|
const contract = new Contract(this._contractAddress, ANTS_TOKEN_ABI, connected);
|
|
54
|
-
const
|
|
55
|
-
const tx = await contract.getFunction('enableTransfers')({ nonce });
|
|
53
|
+
const tx = await this._sendWithNonce(signerAddress, (nonce) => contract.getFunction('enableTransfers')({ nonce }));
|
|
56
54
|
const receipt = await tx.wait();
|
|
57
55
|
if (!receipt)
|
|
58
56
|
throw new Error('Transaction was dropped or replaced');
|
|
@@ -62,8 +60,7 @@ export class ANTSTokenClient extends BaseEvmClient {
|
|
|
62
60
|
const connected = this._ensureConnected(signer);
|
|
63
61
|
const signerAddress = await connected.getAddress();
|
|
64
62
|
const contract = new Contract(this._contractAddress, ANTS_TOKEN_ABI, connected);
|
|
65
|
-
const
|
|
66
|
-
const tx = await contract.getFunction('transferOwnership')(newOwner, { nonce });
|
|
63
|
+
const tx = await this._sendWithNonce(signerAddress, (nonce) => contract.getFunction('transferOwnership')(newOwner, { nonce }));
|
|
67
64
|
const receipt = await tx.wait();
|
|
68
65
|
if (!receipt)
|
|
69
66
|
throw new Error('Transaction was dropped or replaced');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ants-token-client.js","sourceRoot":"","sources":["../../../src/payments/evm/ants-token-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,YAAY,EAAuB,MAAM,QAAQ,CAAC;AAChF,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AASrD,MAAM,cAAc,GAAG;IACrB,qEAAqE;IACrE,oFAAoF;IACpF,wDAAwD;IACxD,gDAAgD;IAChD,kDAAkD;IAClD,mDAAmD;IACnD,0DAA0D;IAC1D,0EAA0E;IAC1E,2EAA2E;IAC3E,uDAAuD;IACvD,kDAAkD;IAClD,kDAAkD;IAClD,qCAAqC;IACrC,uDAAuD;CAC/C,CAAC;AAEX,MAAM,OAAO,eAAgB,SAAQ,aAAa;IAChD,YAAY,MAA6B;QACvC,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,eAAe,EAAE,MAAM,CAAC,eAAe,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;IAC1F,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,OAAe;QAC7B,MAAM,QAAQ,GAAG,IAAI,QAAQ,CAAC,IAAI,CAAC,gBAAgB,EAAE,cAAc,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QACrF,OAAO,QAAQ,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,CAAC;IACpD,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,KAAa,EAAE,OAAe;QAC5C,MAAM,QAAQ,GAAG,IAAI,QAAQ,CAAC,IAAI,CAAC,gBAAgB,EAAE,cAAc,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QACrF,OAAO,QAAQ,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAC3D,CAAC;IAED,KAAK,CAAC,WAAW;QACf,MAAM,QAAQ,GAAG,IAAI,QAAQ,CAAC,IAAI,CAAC,gBAAgB,EAAE,cAAc,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QACrF,OAAO,QAAQ,CAAC,WAAW,CAAC,aAAa,CAAC,EAAE,CAAC;IAC/C,CAAC;IAED,KAAK,CAAC,gBAAgB;QACpB,MAAM,QAAQ,GAAG,IAAI,QAAQ,CAAC,IAAI,CAAC,gBAAgB,EAAE,cAAc,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QACrF,OAAO,QAAQ,CAAC,WAAW,CAAC,kBAAkB,CAAC,EAAE,CAAC;IACpD,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,MAAsB,EAAE,eAAuB;QAC/D,MAAM,SAAS,GAAG,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;QAChD,MAAM,aAAa,GAAG,MAAM,SAAS,CAAC,UAAU,EAAE,CAAC;QACnD,MAAM,QAAQ,GAAG,IAAI,QAAQ,CAAC,IAAI,CAAC,gBAAgB,EAAE,cAAc,EAAE,SAAS,CAAC,CAAC;QAChF,MAAM,
|
|
1
|
+
{"version":3,"file":"ants-token-client.js","sourceRoot":"","sources":["../../../src/payments/evm/ants-token-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"emissions-client.d.ts","sourceRoot":"","sources":["../../../src/payments/evm/emissions-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,KAAK,cAAc,EAAE,MAAM,QAAQ,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAErD,MAAM,WAAW,qBAAqB;IACpC,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AA8CD,MAAM,WAAW,oBAAoB;IACnC,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC;IACrB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,gBAAgB,EAAE,MAAM,CAAC;IACzB,WAAW,EAAE,OAAO,CAAC;CACtB;AAED,qBAAa,eAAgB,SAAQ,aAAa;gBACpC,MAAM,EAAE,qBAAqB;IAInC,oBAAoB,CAAC,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC;IAI/E,mBAAmB,CAAC,MAAM,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC;IAI7F,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAM/F,YAAY,IAAI,OAAO,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,aAAa,EAAE,MAAM,CAAA;KAAE,CAAC;IAcnF,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAKhD,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC;IAM7B,kBAAkB,IAAI,OAAO,CAAC,MAAM,CAAC;IAMrC,iBAAiB,IAAI,OAAO,CAAC,MAAM,CAAC;IAMpC,SAAS,IAAI,OAAO,CAAC,oBAAoB,CAAC;IAqB1C,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC;IA4B5D,sBAAsB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAKtD,qBAAqB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAKrD,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAKjE,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAKhE,kBAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAKpE,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAKnE,YAAY,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"emissions-client.d.ts","sourceRoot":"","sources":["../../../src/payments/evm/emissions-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,KAAK,cAAc,EAAE,MAAM,QAAQ,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAErD,MAAM,WAAW,qBAAqB;IACpC,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AA8CD,MAAM,WAAW,oBAAoB;IACnC,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC;IACrB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,gBAAgB,EAAE,MAAM,CAAC;IACzB,WAAW,EAAE,OAAO,CAAC;CACtB;AAED,qBAAa,eAAgB,SAAQ,aAAa;gBACpC,MAAM,EAAE,qBAAqB;IAInC,oBAAoB,CAAC,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC;IAI/E,mBAAmB,CAAC,MAAM,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC;IAI7F,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAM/F,YAAY,IAAI,OAAO,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,aAAa,EAAE,MAAM,CAAA;KAAE,CAAC;IAcnF,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAKhD,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC;IAM7B,kBAAkB,IAAI,OAAO,CAAC,MAAM,CAAC;IAMrC,iBAAiB,IAAI,OAAO,CAAC,MAAM,CAAC;IAMpC,SAAS,IAAI,OAAO,CAAC,oBAAoB,CAAC;IAqB1C,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC;IA4B5D,sBAAsB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAKtD,qBAAqB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAKrD,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAKjE,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAKhE,kBAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAKpE,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAKnE,YAAY,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC;IAU3D,0FAA0F;IACpF,iBAAiB,IAAI,OAAO,CAAC,MAAM,CAAC;IAKpC,kBAAkB,IAAI,OAAO,CAAC,MAAM,CAAC;CAI5C"}
|
|
@@ -165,8 +165,7 @@ export class EmissionsClient extends BaseEvmClient {
|
|
|
165
165
|
const connected = this._ensureConnected(signer);
|
|
166
166
|
const signerAddress = await connected.getAddress();
|
|
167
167
|
const contract = new Contract(this._contractAddress, EMISSIONS_ABI, connected);
|
|
168
|
-
const
|
|
169
|
-
const tx = await contract.getFunction('flushReserve')({ nonce });
|
|
168
|
+
const tx = await this._sendWithNonce(signerAddress, (nonce) => contract.getFunction('flushReserve')({ nonce }));
|
|
170
169
|
const receipt = await tx.wait();
|
|
171
170
|
if (!receipt)
|
|
172
171
|
throw new Error('Transaction was dropped or replaced');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"emissions-client.js","sourceRoot":"","sources":["../../../src/payments/evm/emissions-client.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"emissions-client.js","sourceRoot":"","sources":["../../../src/payments/evm/emissions-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"identity-client.d.ts","sourceRoot":"","sources":["../../../src/payments/evm/identity-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,KAAK,cAAc,EAAE,MAAM,QAAQ,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAErD,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAkBD,qBAAa,cAAe,SAAQ,aAAa;gBACnC,MAAM,EAAE,oBAAoB;IAMxC;;;;OAIG;IACG,QAAQ,CAAC,MAAM,EAAE,cAAc,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"identity-client.d.ts","sourceRoot":"","sources":["../../../src/payments/evm/identity-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,KAAK,cAAc,EAAE,MAAM,QAAQ,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAErD,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAkBD,qBAAa,cAAe,SAAQ,aAAa;gBACnC,MAAM,EAAE,oBAAoB;IAMxC;;;;OAIG;IACG,QAAQ,CAAC,MAAM,EAAE,cAAc,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAoBvE,WAAW,CAAC,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC;IAIrG,WAAW,CAAC,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAMlF,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAM/C,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAKhD,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;CAMrE"}
|
|
@@ -27,12 +27,11 @@ export class IdentityClient extends BaseEvmClient {
|
|
|
27
27
|
const signerAddress = await connected.getAddress();
|
|
28
28
|
const contract = new Contract(this._contractAddress, IDENTITY_REGISTRY_ABI, connected);
|
|
29
29
|
let tx;
|
|
30
|
-
const nonce = await this._reserveNonce(signerAddress);
|
|
31
30
|
if (metadataURI) {
|
|
32
|
-
tx = await contract.getFunction('register(string)')(metadataURI, { nonce });
|
|
31
|
+
tx = await this._sendWithNonce(signerAddress, (nonce) => contract.getFunction('register(string)')(metadataURI, { nonce }));
|
|
33
32
|
}
|
|
34
33
|
else {
|
|
35
|
-
tx = await contract.getFunction('register()')({ nonce });
|
|
34
|
+
tx = await this._sendWithNonce(signerAddress, (nonce) => contract.getFunction('register()')({ nonce }));
|
|
36
35
|
}
|
|
37
36
|
const receipt = await tx.wait();
|
|
38
37
|
if (!receipt)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"identity-client.js","sourceRoot":"","sources":["../../../src/payments/evm/identity-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,IAAI,SAAS,EAAuB,MAAM,QAAQ,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AASrD,MAAM,qBAAqB,GAAG;IAC5B,eAAe;IACf,gDAAgD;IAChD,0DAA0D;IAE1D,0BAA0B;IAC1B,mEAAmE;IACnE,mEAAmE;IAEnE,WAAW;IACX,yEAAyE;IACzE,iFAAiF;IACjF,4DAA4D;CACpD,CAAC;AAGX,MAAM,OAAO,cAAe,SAAQ,aAAa;IAC/C,YAAY,MAA4B;QACtC,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,eAAe,EAAE,MAAM,CAAC,eAAe,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;IAC1F,CAAC;IAED,sEAAsE;IAEtE;;;;OAIG;IACH,KAAK,CAAC,QAAQ,CAAC,MAAsB,EAAE,WAAoB;QACzD,MAAM,SAAS,GAAG,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;QAChD,MAAM,aAAa,GAAG,MAAM,SAAS,CAAC,UAAU,EAAE,CAAC;QACnD,MAAM,QAAQ,GAAG,IAAI,QAAQ,CAAC,IAAI,CAAC,gBAAgB,EAAE,qBAAqB,EAAE,SAAS,CAAC,CAAC;QAEvF,IAAI,EAAiG,CAAC;QACtG,
|
|
1
|
+
{"version":3,"file":"identity-client.js","sourceRoot":"","sources":["../../../src/payments/evm/identity-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,6 +30,12 @@ export declare const DEFAULT_MIN_SETTLE_DELTA_STR = "2000";
|
|
|
30
30
|
* releasing the buyer's reserve. Long enough to finish and download a video.
|
|
31
31
|
*/
|
|
32
32
|
export declare const ONE_OFF_CHANNEL_TTL_MS: number;
|
|
33
|
+
/**
|
|
34
|
+
* A channel reserved this recently may not show on-chain yet: an RPC can
|
|
35
|
+
* return the reserve receipt before its reads serve that block. Within this
|
|
36
|
+
* window a missing channel is checked again later instead of being evicted.
|
|
37
|
+
*/
|
|
38
|
+
export declare const RESERVE_VISIBILITY_GRACE_MS: number;
|
|
33
39
|
/** A one-off channel whose request never started is closed after this long. */
|
|
34
40
|
export declare const ONE_OFF_UNCLAIMED_TTL_MS: number;
|
|
35
41
|
/** How often channels whose close was given up on are retried. */
|
|
@@ -139,6 +145,8 @@ export declare class SellerPaymentManager {
|
|
|
139
145
|
* Must be called after construction (async, cannot run in constructor).
|
|
140
146
|
*/
|
|
141
147
|
validateHydratedChannels(): Promise<void>;
|
|
148
|
+
/** Reserved too recently for a missing on-chain record to mean the channel is gone. */
|
|
149
|
+
private _mayNotBeVisibleYet;
|
|
142
150
|
private _evictStaleChannel;
|
|
143
151
|
/** Remove connectivity only if it still belongs to the channel being cleaned up. */
|
|
144
152
|
private _deactivateBuyerForChannel;
|
|
@@ -236,6 +244,7 @@ export declare class SellerPaymentManager {
|
|
|
236
244
|
* queue has room, without holding unrelated buyers until a receipt is mined.
|
|
237
245
|
*/
|
|
238
246
|
private _reserveWithBackpressureRetry;
|
|
247
|
+
private _retryUntilChannelVisible;
|
|
239
248
|
private _metadataMatchesHash;
|
|
240
249
|
private _storePendingTopUp;
|
|
241
250
|
private _formatError;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"seller-payment-manager.d.ts","sourceRoot":"","sources":["../../src/payments/seller-payment-manager.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,KAAK,EACV,mBAAmB,EACnB,iBAAiB,EACjB,sBAAsB,EACtB,0BAA0B,EAC1B,yBAAyB,EAE1B,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAU1D,OAAO,EAAE,YAAY,EAA8C,KAAK,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAGlH,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,uBAAuB,EAAE,MAAM,CAAC;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,uEAAuE;IACvE,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,2EAA2E;IAC3E,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B;;;;;OAKG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,+GAA+G;IAC/G,sBAAsB,CAAC,EAAE,OAAO,CAAC;CAClC;AAQD,wDAAwD;AACxD,eAAO,MAAM,4BAA4B,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"seller-payment-manager.d.ts","sourceRoot":"","sources":["../../src/payments/seller-payment-manager.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,KAAK,EACV,mBAAmB,EACnB,iBAAiB,EACjB,sBAAsB,EACtB,0BAA0B,EAC1B,yBAAyB,EAE1B,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAU1D,OAAO,EAAE,YAAY,EAA8C,KAAK,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAGlH,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,uBAAuB,EAAE,MAAM,CAAC;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,uEAAuE;IACvE,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,2EAA2E;IAC3E,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B;;;;;OAKG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,+GAA+G;IAC/G,sBAAsB,CAAC,EAAE,OAAO,CAAC;CAClC;AAQD,wDAAwD;AACxD,eAAO,MAAM,4BAA4B,SAAS,CAAC;AA4BnD;;;GAGG;AACH,eAAO,MAAM,sBAAsB,QAAmB,CAAC;AACvD;;;;GAIG;AACH,eAAO,MAAM,2BAA2B,QAAa,CAAC;AACtD,+EAA+E;AAC/E,eAAO,MAAM,wBAAwB,QAAc,CAAC;AACpD,kEAAkE;AAClE,eAAO,MAAM,iCAAiC,QAAc,CAAC;AA4B7D;;;;;GAKG;AACH,qBAAa,oBAAoB;IAC/B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAiB;IACzC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAiB;IACjD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAsB;IAC9C,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAe;IAC7C;;;;6EAIyE;IACzE,OAAO,CAAC,kBAAkB,CAKT;IACjB;;;;OAIG;IACH,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAqB;IACnD,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAA6B;IAErE,8EAA8E;IAC9E,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAqB;IACzD,mFAAmF;IACnF,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAoC;IAEhE,+EAA+E;IAC/E,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAA6B;IAEjE,sEAAsE;IACtE,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA6B;IAEpD,+EAA+E;IAC/E,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA6B;IAEzD,wGAAwG;IACxG,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAiC;IAE7D;;;;;;;OAOG;IACH,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAqF;IAEtH,8FAA8F;IAC9F,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAA6B;IAE9D;;;;;OAKG;IACH,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAA6B;IAElE;;;;sCAIkC;IAClC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAyF;IAEvH,6EAA6E;IAC7E,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAqB;IACtD,gFAAgF;IAChF,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAoC;IAEhE;;;;OAIG;IACH,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAA2C;IAE5E;;;;;;OAMG;IACH,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAA6B;IAE/D;;wEAEoE;IACpE,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAA6B;IAEpE,yEAAyE;IACzE,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAwC;IAE5E;;;;OAIG;IACH,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAqB;IAEvD,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAS;IAEzC,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAAU;IAElD,8EAA8E;IAC9E,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAK;IAE9C,sDAAsD;IACtD,OAAO,CAAC,yBAAyB,CAAK;IACtC,wFAAwF;IACxF,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAA6B;gBAExD,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,mBAAmB,EAAE,YAAY,EAAE,YAAY;IAoEvF;;;;OAIG;IACG,wBAAwB,IAAI,OAAO,CAAC,IAAI,CAAC;IA8D/C,uFAAuF;IACvF,OAAO,CAAC,mBAAmB;IAI3B,OAAO,CAAC,kBAAkB;IAqB1B,oFAAoF;IACpF,OAAO,CAAC,0BAA0B;IASlC;;;;OAIG;IACH,OAAO,CAAC,YAAY;IAiBpB;;;;OAIG;IACH,OAAO,CAAC,6BAA6B;IA0BrC;;;;;OAKG;IACH,oBAAoB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IA+B5F,OAAO,CAAC,qBAAqB;IAY7B;;;;;OAKG;IACH,OAAO,CAAC,uBAAuB;IAO/B,IAAI,cAAc,IAAI,cAAc,CAEnC;IAID;;;;OAIG;IACG,kBAAkB,CACtB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,mBAAmB,EAC5B,UAAU,EAAE,UAAU,GACrB,OAAO,CAAC,UAAU,GAAG,UAAU,GAAG,UAAU,CAAC;IAwBhD;;;;OAIG;IACG,mBAAmB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;YAO/C,wBAAwB;IA2TtC;;;;OAIG;IACH,OAAO,CAAC,mBAAmB;IA6C3B;;;;OAIG;IACH,kBAAkB,CAAC,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,iBAAiB,GAAG,IAAI;IAazF,2EAA2E;IAC3E,0BAA0B,CAAC,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,aAAa,GAAG,IAAI;IAMxF,qDAAqD;IACrD,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,aAAa,GAAG,IAAI;IAInD,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO;IAI3C;;;OAGG;IACH,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO;IAQ9C;;;;;OAKG;IACG,kBAAkB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;YA8B/D,yBAAyB;IAsBvC;;;;OAIG;YACW,kBAAkB;IAqKhC;;;OAGG;YACW,yBAAyB;IAkDvC,2FAA2F;YAC7E,oBAAoB;IA8BlC,OAAO,CAAC,8BAA8B;YASxB,wBAAwB;IAsBtC,OAAO,CAAC,2BAA2B;IAYnC;;;;;OAKG;YACW,6BAA6B;YAyB7B,yBAAyB;IAkBvC,OAAO,CAAC,oBAAoB;IAU5B,OAAO,CAAC,kBAAkB;IAU1B,OAAO,CAAC,YAAY;IAMpB,OAAO,CAAC,qBAAqB;IAc7B,OAAO,CAAC,+BAA+B;IAOvC,OAAO,CAAC,iBAAiB;YAwBX,iBAAiB;YA2DjB,kBAAkB;YAqDlB,sBAAsB;IAwFpC,OAAO,CAAC,gBAAgB;IAmBxB;;OAEG;IACH,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IAkBtD,qFAAqF;IACrF,OAAO,CAAC,gBAAgB;IAYxB;;;;;;OAMG;IACG,aAAa,CAAC,WAAW,EAAE,MAAM,EAAE,EAAE,gBAAwB,EAAE,UAAkB,EAAE;;;KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAiE9G;;;OAGG;IACH,OAAO,CAAC,cAAc;IAStB,OAAO,CAAC,mBAAmB;IAgB3B,yDAAyD;IACzD,oBAAoB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAI/C,sFAAsF;IACtF,kBAAkB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAM7C,qEAAqE;IACrE,mBAAmB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO;IAIjD;;;;OAIG;IACH,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO;IAQ/C,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IA2B5C;;;;;;;;;OASG;IACG,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IA2DpC;;;;;;;;;;OAUG;YACW,oBAAoB;IAyElC;;;;;;;OAOG;YACW,uBAAuB;IA+DrC;;;;;OAKG;YACW,iBAAiB;IA8B/B;;;;;;OAMG;IACH,oBAAoB,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO;IAalE;;;;;OAKG;IACH,oBAAoB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA8BxD,UAAU,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO;IAIxC,wDAAwD;IACxD,gBAAgB,CAAC,WAAW,EAAE,MAAM,GAAG,aAAa,GAAG,IAAI;IAI3D,qEAAqE;IACrE,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;IAI7C,gEAAgE;IAChE,qBAAqB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;IAIhD,6DAA6D;IAC7D,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;IAIxC,iHAAiH;IACjH,sBAAsB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;IAIjD,mEAAmE;IACnE,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO;IAI5C,2DAA2D;IAC3D,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO;IAI3C,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,wBAAwB,CAAc;IAE9D;;OAEG;IACH,sBAAsB,CACpB,SAAS,EAAE,MAAM,EACjB,WAAW,CAAC,EAAE,MAAM,EACpB,OAAO,CAAC,EAAE;QAAE,kBAAkB,CAAC,EAAE,MAAM,CAAC;QAAC,mBAAmB,CAAC,EAAE,MAAM,CAAC;QAAC,wBAAwB,CAAC,EAAE,MAAM,CAAA;KAAE,GACzG,sBAAsB;IAyBzB;;;;;;;;;;;OAWG;IACG,yBAAyB,CAC7B,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,0BAA0B,EACnC,UAAU,EAAE,UAAU,GACrB,OAAO,CAAC,yBAAyB,CAAC;IAgJrC;;;;OAIG;YACW,qBAAqB;IAuCnC;;;;OAIG;IACH,OAAO,CAAC,oBAAoB;IAiC5B;;;;OAIG;IACG,oBAAoB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA+B5D;;;OAGG;IACG,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAuB5D,KAAK,IAAI,IAAI;CAGd"}
|
|
@@ -27,6 +27,13 @@ const INSUFFICIENT_BALANCE_SELECTOR = '0xf4d678b8';
|
|
|
27
27
|
const IN_FLIGHT_TX_LIMIT_PHRASE = 'in-flight transaction limit';
|
|
28
28
|
/** Backoff stays well inside the buyer's 30-second AuthAck timeout. */
|
|
29
29
|
const RESERVE_BACKPRESSURE_RETRY_DELAYS_MS = [250, 500, 1_000, 2_000, 4_000];
|
|
30
|
+
/**
|
|
31
|
+
* Retries for a write that follows a reserve and reverts ChannelNotActive:
|
|
32
|
+
* the RPC node serving it has not seen the reserve's block yet.
|
|
33
|
+
*/
|
|
34
|
+
const CHANNEL_VISIBILITY_RETRY_DELAYS_MS = [500, 1_000, 2_000, 4_000];
|
|
35
|
+
/** `ChannelNotActive()` selector, matched when ethers could not decode the revert. */
|
|
36
|
+
const CHANNEL_NOT_ACTIVE_SELECTOR = '0xac853123';
|
|
30
37
|
/** How long a one-off plan offered in a 402 stays valid for the buyer's opening auth. */
|
|
31
38
|
const ONE_OFF_PLAN_TTL_MS = 2 * 60_000;
|
|
32
39
|
/**
|
|
@@ -34,6 +41,12 @@ const ONE_OFF_PLAN_TTL_MS = 2 * 60_000;
|
|
|
34
41
|
* releasing the buyer's reserve. Long enough to finish and download a video.
|
|
35
42
|
*/
|
|
36
43
|
export const ONE_OFF_CHANNEL_TTL_MS = 24 * 60 * 60_000;
|
|
44
|
+
/**
|
|
45
|
+
* A channel reserved this recently may not show on-chain yet: an RPC can
|
|
46
|
+
* return the reserve receipt before its reads serve that block. Within this
|
|
47
|
+
* window a missing channel is checked again later instead of being evicted.
|
|
48
|
+
*/
|
|
49
|
+
export const RESERVE_VISIBILITY_GRACE_MS = 5 * 60_000;
|
|
37
50
|
/** A one-off channel whose request never started is closed after this long. */
|
|
38
51
|
export const ONE_OFF_UNCLAIMED_TTL_MS = 10 * 60_000;
|
|
39
52
|
/** How often channels whose close was given up on are retried. */
|
|
@@ -219,6 +232,8 @@ export class SellerPaymentManager {
|
|
|
219
232
|
for (const channel of activeChannels) {
|
|
220
233
|
try {
|
|
221
234
|
const onChainState = classifyOnChainChannel(await this._channelsClient.getSession(channel.sessionId));
|
|
235
|
+
if (!onChainState.exists && this._mayNotBeVisibleYet(channel))
|
|
236
|
+
continue;
|
|
222
237
|
if (!onChainState.exists || (onChainState.status !== 'active' && onChainState.status !== 'unknown')) {
|
|
223
238
|
this._evictStaleChannel(channel.sessionId, channel.peerId, `on-chain status=${onChainState.exists ? onChainState.status : 'missing'}`);
|
|
224
239
|
evicted++;
|
|
@@ -263,6 +278,10 @@ export class SellerPaymentManager {
|
|
|
263
278
|
debugLog(`[SellerPayment] Startup validation: evicted ${evicted}/${activeChannels.length} stale channel(s)`);
|
|
264
279
|
}
|
|
265
280
|
}
|
|
281
|
+
/** Reserved too recently for a missing on-chain record to mean the channel is gone. */
|
|
282
|
+
_mayNotBeVisibleYet(channel) {
|
|
283
|
+
return Date.now() - channel.reservedAt < RESERVE_VISIBILITY_GRACE_MS;
|
|
284
|
+
}
|
|
266
285
|
_evictStaleChannel(channelId, peerId, reason, status = CHANNEL_STATUS.SETTLED) {
|
|
267
286
|
this._channelStore.updateChannelStatus(channelId, status);
|
|
268
287
|
this._acceptedCumulative.delete(channelId);
|
|
@@ -894,22 +913,49 @@ export class SellerPaymentManager {
|
|
|
894
913
|
}
|
|
895
914
|
this._pendingOneOffPlans.delete(planKey);
|
|
896
915
|
await this._reserveWithBackpressureRetry(channelId, () => this._channelsClient.reserve(this._signer, buyerEvmAddr, payload.reserveSalt, openingReserve, BigInt(reserveDeadline), payload.spendingAuthSig));
|
|
916
|
+
const now = Date.now();
|
|
917
|
+
const { seller: sellerEvmAddr } = await this._resolvedAddresses;
|
|
897
918
|
if (batch) {
|
|
919
|
+
// Record the reserve before the top-up: if anything below fails, the
|
|
920
|
+
// channel still holds the buyer's funds and must stay known so the
|
|
921
|
+
// one-off check closes it, rather than leaving an orphan on-chain.
|
|
922
|
+
this._channelStore.upsertChannel({
|
|
923
|
+
sessionId: channelId,
|
|
924
|
+
peerId: buyerPeerId,
|
|
925
|
+
role: CHANNEL_ROLE.SELLER,
|
|
926
|
+
channelKind: CHANNEL_KIND.ONE_OFF,
|
|
927
|
+
oneOffRequestId: requestId,
|
|
928
|
+
sellerEvmAddr,
|
|
929
|
+
buyerEvmAddr,
|
|
930
|
+
nonce: 0,
|
|
931
|
+
authMax: '0',
|
|
932
|
+
previousConsumption: openingReserve.toString(), // repurposed: stores reserveMax
|
|
933
|
+
deadline: reserveDeadline,
|
|
934
|
+
previousSessionId: '',
|
|
935
|
+
tokensDelivered: '0',
|
|
936
|
+
requestCount: 0,
|
|
937
|
+
reservedAt: now,
|
|
938
|
+
settledAt: null,
|
|
939
|
+
settledAmount: null,
|
|
940
|
+
status: CHANNEL_STATUS.ACTIVE,
|
|
941
|
+
latestBuyerSig: payload.spendingAuthSig,
|
|
942
|
+
latestSpendingAuthSig: null,
|
|
943
|
+
latestMetadata: payload.metadata,
|
|
944
|
+
createdAt: now,
|
|
945
|
+
updatedAt: now,
|
|
946
|
+
});
|
|
898
947
|
try {
|
|
899
|
-
await this._channelsClient.topUp(this._signer, channelId, latestAuth.cumulativeAmount, batch.metadata, batch.spendingAuthSig, finalReserve, BigInt(finalDeadline), batch.reserveAuthSig);
|
|
948
|
+
await this._retryUntilChannelVisible(channelId, 'top-up', () => this._channelsClient.topUp(this._signer, channelId, latestAuth.cumulativeAmount, batch.metadata, batch.spendingAuthSig, finalReserve, BigInt(finalDeadline), batch.reserveAuthSig));
|
|
900
949
|
}
|
|
901
950
|
catch (err) {
|
|
902
|
-
|
|
903
|
-
|
|
904
|
-
|
|
905
|
-
|
|
906
|
-
debugWarn(`[SellerPayment] Failed to release one-off reserve after top-up failure: ${this._formatError(closeErr)}`);
|
|
951
|
+
this._oneOffChannelIds.add(channelId);
|
|
952
|
+
this._reserveMax.set(channelId, openingReserve);
|
|
953
|
+
if (!(await this.closeOneOffChannel(channelId, 'top-up failed'))) {
|
|
954
|
+
debugWarn(`[SellerPayment] Failed to release one-off reserve after top-up failure; the one-off check retries the close`);
|
|
907
955
|
}
|
|
908
956
|
throw err;
|
|
909
957
|
}
|
|
910
958
|
}
|
|
911
|
-
const now = Date.now();
|
|
912
|
-
const { seller: sellerEvmAddr } = await this._resolvedAddresses;
|
|
913
959
|
const session = {
|
|
914
960
|
sessionId: channelId,
|
|
915
961
|
peerId: buyerPeerId,
|
|
@@ -1003,6 +1049,8 @@ export class SellerPaymentManager {
|
|
|
1003
1049
|
for (const channel of this._channelStore.getActiveChannels(CHANNEL_ROLE.SELLER, CHANNEL_KIND.ONE_OFF)) {
|
|
1004
1050
|
try {
|
|
1005
1051
|
const state = classifyOnChainChannel(await this._channelsClient.getSession(channel.sessionId));
|
|
1052
|
+
if (!state.exists && this._mayNotBeVisibleYet(channel))
|
|
1053
|
+
continue;
|
|
1006
1054
|
if (!state.exists || (state.status !== 'active' && state.status !== 'unknown')) {
|
|
1007
1055
|
this._evictStaleChannel(channel.sessionId, channel.peerId, `one-off on-chain status=${state.exists ? state.status : 'missing'}`);
|
|
1008
1056
|
continue;
|
|
@@ -1087,6 +1135,21 @@ export class SellerPaymentManager {
|
|
|
1087
1135
|
}
|
|
1088
1136
|
}
|
|
1089
1137
|
}
|
|
1138
|
+
async _retryUntilChannelVisible(channelId, label, submit) {
|
|
1139
|
+
for (let attempt = 0;; attempt += 1) {
|
|
1140
|
+
try {
|
|
1141
|
+
return await submit();
|
|
1142
|
+
}
|
|
1143
|
+
catch (err) {
|
|
1144
|
+
const delayMs = CHANNEL_VISIBILITY_RETRY_DELAYS_MS[attempt];
|
|
1145
|
+
const text = this._flattenErrorText(err);
|
|
1146
|
+
if (delayMs === undefined || !(text.includes('ChannelNotActive') || text.includes(CHANNEL_NOT_ACTIVE_SELECTOR)))
|
|
1147
|
+
throw err;
|
|
1148
|
+
debugWarn(`[SellerPayment] ${label} for ${channelId.slice(0, 18)}... does not see the reserve yet — retrying in ${delayMs}ms`);
|
|
1149
|
+
await new Promise((resolve) => setTimeout(resolve, delayMs));
|
|
1150
|
+
}
|
|
1151
|
+
}
|
|
1152
|
+
}
|
|
1090
1153
|
_metadataMatchesHash(payload) {
|
|
1091
1154
|
try {
|
|
1092
1155
|
const metadata = payload.metadata || encodeMetadata(ZERO_METADATA);
|
|
@@ -1507,6 +1570,8 @@ export class SellerPaymentManager {
|
|
|
1507
1570
|
try {
|
|
1508
1571
|
// Validate on-chain state — evict if channel no longer exists
|
|
1509
1572
|
const onChainState = classifyOnChainChannel(await this._channelsClient.getSession(channel.sessionId));
|
|
1573
|
+
if (!onChainState.exists && this._mayNotBeVisibleYet(channel))
|
|
1574
|
+
continue;
|
|
1510
1575
|
if (!onChainState.exists || (onChainState.status !== 'active' && onChainState.status !== 'unknown')) {
|
|
1511
1576
|
this._evictStaleChannel(channel.sessionId, channel.peerId, `periodic check: on-chain status=${onChainState.exists ? onChainState.status : 'missing'}`);
|
|
1512
1577
|
continue;
|