@airgap/optimism 0.13.21-beta.6 → 0.13.21
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/package.json +6 -7
- package/v1/client/node/HttpOptimismNodeClient.d.ts +3 -3
- package/v1/client/node/HttpOptimismNodeClient.js +7 -7
- package/v1/client/node/HttpOptimismNodeClient.js.map +1 -1
- package/v1/client/node/OptimismNodeClient.d.ts +3 -3
- package/v1/module/ERC20Tokens.d.ts +1 -1
- package/v1/module/OptimismModule.js +2 -2
- package/v1/module/OptimismModule.js.map +1 -1
- package/v1/protocol/OptimismBaseProtocol.d.ts +3 -4
- package/v1/protocol/OptimismBaseProtocol.js +8 -8
- package/v1/protocol/OptimismBaseProtocol.js.map +1 -1
- package/v1/protocol/OptimismProtocol.js +9 -11
- package/v1/protocol/OptimismProtocol.js.map +1 -1
- package/v1/protocol/erc20/ERC20Token.d.ts +2 -3
- package/v1/protocol/erc20/ERC20Token.js +4 -6
- package/v1/protocol/erc20/ERC20Token.js.map +1 -1
- package/v1/serializer/v3/schemas/converter/transaction-converter.js +7 -7
- package/v1/serializer/v3/schemas/converter/transaction-converter.js.map +1 -1
- package/v1/serializer/v3/schemas/definitions/transaction-sign-request-optimism-typed.d.ts +2 -2
- package/v1/serializer/v3/schemas/definitions/transaction-sign-request-optimism.d.ts +1 -1
- package/v1/serializer/v3/schemas/definitions/transaction-sign-response-optimism.d.ts +2 -2
- package/v1/serializer/v3/validators/transaction-validator.d.ts +2 -2
- package/v1/serializer/v3/validators/transaction-validator.js +2 -2
- package/v1/serializer/v3/validators/transaction-validator.js.map +1 -1
- package/v1/types/crypto.d.ts +2 -2
- package/v1/types/protocol.d.ts +3 -3
- package/v1/types/transaction.d.ts +4 -5
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@airgap/optimism",
|
|
3
|
-
"version": "0.13.21
|
|
3
|
+
"version": "0.13.21",
|
|
4
4
|
"description": "The @airgap/optimism is an Optimism implementation of the ICoinProtocol interface from @airgap/coinlib-core.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"airgap",
|
|
@@ -31,12 +31,11 @@
|
|
|
31
31
|
},
|
|
32
32
|
"author": "Papers AG <contact@papers.ch> (https://papers.ch)",
|
|
33
33
|
"dependencies": {
|
|
34
|
-
"@airgap/coinlib-core": "^0.13.21
|
|
35
|
-
"@airgap/crypto": "^0.13.21
|
|
36
|
-
"@airgap/ethereum": "^0.13.21
|
|
37
|
-
"@airgap/
|
|
38
|
-
"@airgap/
|
|
39
|
-
"@airgap/serializer": "^0.13.21-beta.6",
|
|
34
|
+
"@airgap/coinlib-core": "^0.13.21",
|
|
35
|
+
"@airgap/crypto": "^0.13.21",
|
|
36
|
+
"@airgap/ethereum": "^0.13.21",
|
|
37
|
+
"@airgap/module-kit": "^0.13.21",
|
|
38
|
+
"@airgap/serializer": "^0.13.21",
|
|
40
39
|
"@ethereumjs/tx": "3.4.0"
|
|
41
40
|
},
|
|
42
41
|
"nyc": {
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import BigNumber from '@airgap/coinlib-core/dependencies/src/bignumber.js-9.0.0/bignumber';
|
|
2
|
-
import {
|
|
2
|
+
import { HttpEthereumNodeClient, EthereumUnsignedTransaction } from '@airgap/ethereum/v1';
|
|
3
3
|
import { OptimismNodeClient } from './OptimismNodeClient';
|
|
4
|
-
export declare class HttpOptimismNodeClient extends
|
|
4
|
+
export declare class HttpOptimismNodeClient extends HttpEthereumNodeClient implements OptimismNodeClient {
|
|
5
5
|
constructor(baseURL: string, headers?: any);
|
|
6
|
-
getL1Fee(contractAddress: string, tx:
|
|
6
|
+
getL1Fee(contractAddress: string, tx: EthereumUnsignedTransaction): Promise<BigNumber>;
|
|
7
7
|
}
|
|
@@ -57,14 +57,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
57
57
|
exports.HttpOptimismNodeClient = void 0;
|
|
58
58
|
// tslint:disable: max-classes-per-file
|
|
59
59
|
var bignumber_1 = __importDefault(require("@airgap/coinlib-core/dependencies/src/bignumber.js-9.0.0/bignumber"));
|
|
60
|
-
var
|
|
60
|
+
var v1_1 = require("@airgap/ethereum/v1");
|
|
61
61
|
var tx_1 = require("@ethereumjs/tx");
|
|
62
62
|
var OptimismRPCDataGetL1Fee = /** @class */ (function (_super) {
|
|
63
63
|
__extends(OptimismRPCDataGetL1Fee, _super);
|
|
64
64
|
function OptimismRPCDataGetL1Fee(tx) {
|
|
65
65
|
var _this = _super.call(this, "".concat(OptimismRPCDataGetL1Fee.methodName, "(bytes)")) || this;
|
|
66
66
|
_this.bytes =
|
|
67
|
-
tx.
|
|
67
|
+
tx.ethereumType === 'raw'
|
|
68
68
|
? tx_1.Transaction.fromTxData({
|
|
69
69
|
nonce: tx.nonce,
|
|
70
70
|
gasLimit: tx.gasLimit,
|
|
@@ -77,15 +77,15 @@ var OptimismRPCDataGetL1Fee = /** @class */ (function (_super) {
|
|
|
77
77
|
return _this;
|
|
78
78
|
}
|
|
79
79
|
OptimismRPCDataGetL1Fee.prototype.abiEncoded = function () {
|
|
80
|
-
var bytesLength =
|
|
80
|
+
var bytesLength = v1_1.EthereumUtils.toHex(this.bytes.length);
|
|
81
81
|
if (bytesLength.startsWith('0x')) {
|
|
82
82
|
bytesLength = bytesLength.slice(2);
|
|
83
83
|
}
|
|
84
|
-
return _super.prototype.abiEncoded.call(this) +
|
|
84
|
+
return _super.prototype.abiEncoded.call(this) + v1_1.EthereumRPCData.addLeadingZeroPadding(bytesLength + this.bytes.toString('hex'), 256);
|
|
85
85
|
};
|
|
86
86
|
OptimismRPCDataGetL1Fee.methodName = 'getL1Fee';
|
|
87
87
|
return OptimismRPCDataGetL1Fee;
|
|
88
|
-
}(
|
|
88
|
+
}(v1_1.EthereumRPCData));
|
|
89
89
|
var HttpOptimismNodeClient = /** @class */ (function (_super) {
|
|
90
90
|
__extends(HttpOptimismNodeClient, _super);
|
|
91
91
|
function HttpOptimismNodeClient(baseURL, headers) {
|
|
@@ -98,7 +98,7 @@ var HttpOptimismNodeClient = /** @class */ (function (_super) {
|
|
|
98
98
|
switch (_a.label) {
|
|
99
99
|
case 0:
|
|
100
100
|
data = new OptimismRPCDataGetL1Fee(tx);
|
|
101
|
-
body = new
|
|
101
|
+
body = new v1_1.EthereumRPCBody('eth_call', [{ to: contractAddress, data: data.abiEncoded() }, v1_1.EthereumRPCBody.blockLatest]);
|
|
102
102
|
return [4 /*yield*/, this.send(body)];
|
|
103
103
|
case 1:
|
|
104
104
|
response = _a.sent();
|
|
@@ -109,6 +109,6 @@ var HttpOptimismNodeClient = /** @class */ (function (_super) {
|
|
|
109
109
|
});
|
|
110
110
|
};
|
|
111
111
|
return HttpOptimismNodeClient;
|
|
112
|
-
}(
|
|
112
|
+
}(v1_1.HttpEthereumNodeClient));
|
|
113
113
|
exports.HttpOptimismNodeClient = HttpOptimismNodeClient;
|
|
114
114
|
//# sourceMappingURL=HttpOptimismNodeClient.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HttpOptimismNodeClient.js","sourceRoot":"","sources":["../../../../src/v1/client/node/HttpOptimismNodeClient.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAuC;AACvC,iHAA0F;AAC1F,
|
|
1
|
+
{"version":3,"file":"HttpOptimismNodeClient.js","sourceRoot":"","sources":["../../../../src/v1/client/node/HttpOptimismNodeClient.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAuC;AACvC,iHAA0F;AAC1F,0CAA0I;AAC1I,qCAA4C;AAI5C;IAAsC,2CAAe;IAInD,iCAAY,EAA+B;QAA3C,YACE,kBAAM,UAAG,uBAAuB,CAAC,UAAU,YAAS,CAAC,SAYtD;QAXC,KAAI,CAAC,KAAK;YACR,EAAE,CAAC,YAAY,KAAK,KAAK;gBACvB,CAAC,CAAC,gBAAW,CAAC,UAAU,CAAC;oBACrB,KAAK,EAAE,EAAE,CAAC,KAAK;oBACf,QAAQ,EAAE,EAAE,CAAC,QAAQ;oBACrB,QAAQ,EAAE,EAAE,CAAC,QAAQ;oBACrB,EAAE,EAAE,EAAE,CAAC,EAAE;oBACT,KAAK,EAAE,EAAE,CAAC,KAAK;oBACf,IAAI,EAAE,EAAE,CAAC,IAAI;iBACd,CAAC,CAAC,SAAS,EAAE;gBAChB,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,UAAU,EAAE,KAAK,CAAC,CAAA;;IACzC,CAAC;IAEM,4CAAU,GAAjB;QACE,IAAI,WAAW,GAAG,kBAAa,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;QACxD,IAAI,WAAW,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;YAChC,WAAW,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;SACnC;QAED,OAAO,iBAAM,UAAU,WAAE,GAAG,oBAAe,CAAC,qBAAqB,CAAC,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,CAAA;IAClH,CAAC;IAzBa,kCAAU,GAAW,UAAU,CAAA;IA0B/C,8BAAC;CAAA,AA3BD,CAAsC,oBAAe,GA2BpD;AAED;IAA4C,0CAAsB;IAChE,gCAAY,OAAe,EAAE,OAAa;eACxC,kBAAM,OAAO,EAAE,OAAO,CAAC;IACzB,CAAC;IAEY,yCAAQ,GAArB,UAAsB,eAAuB,EAAE,EAA+B;;;;;;wBACtE,IAAI,GAAG,IAAI,uBAAuB,CAAC,EAAE,CAAC,CAAA;wBACtC,IAAI,GAAG,IAAI,oBAAe,CAAC,UAAU,EAAE,CAAC,EAAE,EAAE,EAAE,eAAe,EAAE,IAAI,EAAE,IAAI,CAAC,UAAU,EAAE,EAAE,EAAE,oBAAe,CAAC,WAAW,CAAC,CAAC,CAAA;wBAE5G,qBAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAA;;wBAAhC,QAAQ,GAAG,SAAqB;wBAChC,GAAG,GAAG,IAAI,mBAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;wBAE1C,sBAAO,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,mBAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,EAAA;;;;KAC5C;IACH,6BAAC;AAAD,CAAC,AAdD,CAA4C,2BAAsB,GAcjE;AAdY,wDAAsB"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import BigNumber from '@airgap/coinlib-core/dependencies/src/bignumber.js-9.0.0/bignumber';
|
|
2
|
-
import {
|
|
3
|
-
export interface OptimismNodeClient extends
|
|
4
|
-
getL1Fee(contractAddress: string, tx:
|
|
2
|
+
import { EthereumNodeClient, EthereumUnsignedTransaction } from '@airgap/ethereum/v1';
|
|
3
|
+
export interface OptimismNodeClient extends EthereumNodeClient {
|
|
4
|
+
getL1Fee(contractAddress: string, tx: EthereumUnsignedTransaction): Promise<BigNumber>;
|
|
5
5
|
}
|
|
@@ -50,7 +50,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
50
50
|
exports.OptimismModule = void 0;
|
|
51
51
|
var coinlib_core_1 = require("@airgap/coinlib-core");
|
|
52
52
|
var errors_1 = require("@airgap/coinlib-core/errors");
|
|
53
|
-
var
|
|
53
|
+
var v1_1 = require("@airgap/ethereum/v1");
|
|
54
54
|
var module_kit_1 = require("@airgap/module-kit");
|
|
55
55
|
var module_1 = require("../module");
|
|
56
56
|
var ERC20Token_1 = require("../protocol/erc20/ERC20Token");
|
|
@@ -101,7 +101,7 @@ var OptimismModule = /** @class */ (function () {
|
|
|
101
101
|
if (network === undefined) {
|
|
102
102
|
throw new errors_1.ConditionViolationError(coinlib_core_1.Domain.OPTIMISM, 'Block Explorer network type not supported.');
|
|
103
103
|
}
|
|
104
|
-
return [2 /*return*/, new
|
|
104
|
+
return [2 /*return*/, new v1_1.EtherscanBlockExplorer(network.blockExplorerUrl)];
|
|
105
105
|
});
|
|
106
106
|
});
|
|
107
107
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OptimismModule.js","sourceRoot":"","sources":["../../../src/v1/module/OptimismModule.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qDAAsF;AACtF,sDAAqE;AACrE,
|
|
1
|
+
{"version":3,"file":"OptimismModule.js","sourceRoot":"","sources":["../../../src/v1/module/OptimismModule.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
import { EthereumUnits } from '@airgap/ethereum';
|
|
2
|
-
import {
|
|
3
|
-
import { Address, AirGapProtocol, AirGapTransaction, AirGapTransactionStatus, AirGapTransactionsWithCursor, Amount, Balance, CryptoDerivative, ExtendedKeyPair, ExtendedPublicKey, ExtendedSecretKey, FeeDefaults, KeyPair, ProtocolMetadata, ProtocolUnitsMetadata, PublicKey, SecretKey, Signature, TransactionFullConfiguration, TransactionDetails, WalletConnectRequest, TokenDetails, TransactionCursor } from '@airgap/module-kit';
|
|
1
|
+
import { EthereumBaseProtocolImpl, EthereumUnits } from '@airgap/ethereum/v1';
|
|
2
|
+
import { Address, AirGapProtocol, AirGapTransaction, AirGapTransactionStatus, AirGapTransactionsWithCursor, Amount, Balance, CryptoDerivative, ExtendedKeyPair, ExtendedPublicKey, ExtendedSecretKey, FeeDefaults, KeyPair, ProtocolMetadata, ProtocolUnitsMetadata, PublicKey, SecretKey, Signature, TransactionFullConfiguration, TransactionDetails, WalletConnectRequest, TokenDetails } from '@airgap/module-kit';
|
|
4
3
|
import { OptimismInfoClient } from '../client/info/OptimismInfoClient';
|
|
5
4
|
import { OptimismNodeClient } from '../client/node/OptimismNodeClient';
|
|
6
5
|
import { OptimismCryptoConfiguration } from '../types/crypto';
|
|
@@ -18,7 +17,7 @@ export interface OptimismBaseProtocol<_Units extends string = EthereumUnits> ext
|
|
|
18
17
|
TransactionCursor: OptimismTransactionCursor;
|
|
19
18
|
}, 'Bip32', 'Crypto', 'FetchDataForAddress', 'FetchDataForMultipleAddresses', 'GetTokenBalances', 'TransactionStatusChecker', 'WalletConnect'> {
|
|
20
19
|
}
|
|
21
|
-
export declare abstract class OptimismBaseProtocolImpl<_Units extends string = EthereumUnits, _EthereumProtocol extends
|
|
20
|
+
export declare abstract class OptimismBaseProtocolImpl<_Units extends string = EthereumUnits, _EthereumProtocol extends EthereumBaseProtocolImpl<_Units, OptimismProtocolNetwork> = EthereumBaseProtocolImpl<_Units, OptimismProtocolNetwork>, _Options extends OptimismProtocolOptions = OptimismProtocolOptions> implements OptimismBaseProtocol<_Units> {
|
|
22
21
|
protected readonly ethereumProtocol: _EthereumProtocol;
|
|
23
22
|
protected readonly nodeClient: OptimismNodeClient;
|
|
24
23
|
protected readonly infoClient: OptimismInfoClient;
|
|
@@ -52,7 +52,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
52
52
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
53
53
|
exports.OptimismBaseProtocolImpl = void 0;
|
|
54
54
|
var bignumber_1 = __importDefault(require("@airgap/coinlib-core/dependencies/src/bignumber.js-9.0.0/bignumber"));
|
|
55
|
-
var
|
|
55
|
+
var v1_1 = require("@airgap/ethereum/v1");
|
|
56
56
|
var module_kit_1 = require("@airgap/module-kit");
|
|
57
57
|
// Implementation
|
|
58
58
|
var OptimismBaseProtocolImpl = /** @class */ (function () {
|
|
@@ -94,7 +94,7 @@ var OptimismBaseProtocolImpl = /** @class */ (function () {
|
|
|
94
94
|
case 0: return [4 /*yield*/, this.ethereumProtocol.getDetailsFromTransaction(transaction, publicKey)];
|
|
95
95
|
case 1:
|
|
96
96
|
ethereumDetails = _a.sent();
|
|
97
|
-
l1DataFee = transaction.type === 'signed' ? transaction.l1DataFee : transaction.
|
|
97
|
+
l1DataFee = transaction.type === 'signed' ? transaction.l1DataFee : transaction.ethereumType === 'raw' ? transaction.l1DataFee : undefined;
|
|
98
98
|
if (l1DataFee === undefined) {
|
|
99
99
|
return [2 /*return*/, ethereumDetails];
|
|
100
100
|
}
|
|
@@ -158,7 +158,7 @@ var OptimismBaseProtocolImpl = /** @class */ (function () {
|
|
|
158
158
|
case 0: return [4 /*yield*/, this.ethereumProtocol.signTransactionWithSecretKey(transaction, secretKey)];
|
|
159
159
|
case 1:
|
|
160
160
|
ethereumTransaction = _a.sent();
|
|
161
|
-
return [2 /*return*/, transaction.
|
|
161
|
+
return [2 /*return*/, transaction.ethereumType === 'raw'
|
|
162
162
|
? (0, module_kit_1.newSignedTransaction)(__assign(__assign({}, ethereumTransaction), { l1DataFee: transaction.l1DataFee }))
|
|
163
163
|
: ethereumTransaction];
|
|
164
164
|
}
|
|
@@ -318,18 +318,18 @@ var OptimismBaseProtocolImpl = /** @class */ (function () {
|
|
|
318
318
|
case 0: return [4 /*yield*/, this.ethereumProtocol.prepareTransactionWithPublicKey(publicKey, details, configuration)];
|
|
319
319
|
case 1:
|
|
320
320
|
ethereumTransaction = _a.sent();
|
|
321
|
-
if (ethereumTransaction.
|
|
321
|
+
if (ethereumTransaction.ethereumType === 'typed') {
|
|
322
322
|
return [2 /*return*/, ethereumTransaction];
|
|
323
323
|
}
|
|
324
324
|
return [4 /*yield*/, this.nodeClient.getL1Fee(this.options.network.gasPriceOracleAddress, ethereumTransaction)];
|
|
325
325
|
case 2:
|
|
326
326
|
l1Gas = _a.sent();
|
|
327
|
-
gasLimit =
|
|
328
|
-
gasPrice =
|
|
327
|
+
gasLimit = v1_1.EthereumUtils.hexToNumber(ethereumTransaction.gasLimit);
|
|
328
|
+
gasPrice = v1_1.EthereumUtils.hexToNumber(ethereumTransaction.gasPrice);
|
|
329
329
|
totalGas = gasPrice.times(gasLimit);
|
|
330
330
|
l2Gas = totalGas.minus(l1Gas).abs();
|
|
331
331
|
newGasPrice = l2Gas.div(gasLimit).integerValue(bignumber_1.default.ROUND_CEIL);
|
|
332
|
-
return [2 /*return*/, (0, module_kit_1.newUnsignedTransaction)(__assign(__assign({}, ethereumTransaction), { gasPrice:
|
|
332
|
+
return [2 /*return*/, (0, module_kit_1.newUnsignedTransaction)(__assign(__assign({}, ethereumTransaction), { gasPrice: v1_1.EthereumUtils.toHex(newGasPrice.toFixed()), l1DataFee: l1Gas.toFixed() }))];
|
|
333
333
|
}
|
|
334
334
|
});
|
|
335
335
|
});
|
|
@@ -349,7 +349,7 @@ var OptimismBaseProtocolImpl = /** @class */ (function () {
|
|
|
349
349
|
case 0: return [4 /*yield*/, this.ethereumProtocol.prepareWalletConnectTransactionWithPublicKey(publicKey, request)];
|
|
350
350
|
case 1:
|
|
351
351
|
ethereumTransaction = _a.sent();
|
|
352
|
-
if (ethereumTransaction.
|
|
352
|
+
if (ethereumTransaction.ethereumType === 'typed') {
|
|
353
353
|
return [2 /*return*/, ethereumTransaction];
|
|
354
354
|
}
|
|
355
355
|
return [4 /*yield*/, this.nodeClient.getL1Fee(this.options.network.gasPriceOracleAddress, ethereumTransaction)];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OptimismBaseProtocol.js","sourceRoot":"","sources":["../../../src/v1/protocol/OptimismBaseProtocol.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iHAA0F;
|
|
1
|
+
{"version":3,"file":"OptimismBaseProtocol.js","sourceRoot":"","sources":["../../../src/v1/protocol/OptimismBaseProtocol.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,7 +28,7 @@ var __assign = (this && this.__assign) || function () {
|
|
|
28
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
29
|
exports.createOptimismProtocolOptions = exports.OPTIMISM_MAINNET_PROTOCOL_NETWORK = exports.createOptimismProtocol = void 0;
|
|
30
30
|
var coinlib_core_1 = require("@airgap/coinlib-core");
|
|
31
|
-
var
|
|
31
|
+
var v1_1 = require("@airgap/ethereum/v1");
|
|
32
32
|
var module_kit_1 = require("@airgap/module-kit");
|
|
33
33
|
var HttpOptimismNodeClient_1 = require("../client/node/HttpOptimismNodeClient");
|
|
34
34
|
var OptimismBaseProtocol_1 = require("./OptimismBaseProtocol");
|
|
@@ -38,26 +38,24 @@ var OptimismProtocolImpl = /** @class */ (function (_super) {
|
|
|
38
38
|
function OptimismProtocolImpl(options) {
|
|
39
39
|
var completeOptions = createOptimismProtocolOptions(options.network);
|
|
40
40
|
var nodeClient = new HttpOptimismNodeClient_1.HttpOptimismNodeClient(completeOptions.network.rpcUrl);
|
|
41
|
-
var infoClient = new
|
|
41
|
+
var infoClient = new v1_1.EtherscanInfoClient(completeOptions.network.blockExplorerApi);
|
|
42
42
|
var baseProtocolOptions = {
|
|
43
43
|
network: completeOptions.network,
|
|
44
44
|
identifier: coinlib_core_1.MainProtocolSymbols.OPTIMISM,
|
|
45
45
|
name: 'Optimism',
|
|
46
|
-
units: __assign(__assign({},
|
|
47
|
-
symbol: __assign(__assign({},
|
|
48
|
-
decimals:
|
|
46
|
+
units: __assign(__assign({}, v1_1.DEFAULT_ETHEREUM_UNITS_METADATA), { ETH: {
|
|
47
|
+
symbol: __assign(__assign({}, v1_1.DEFAULT_ETHEREUM_UNITS_METADATA.ETH.symbol), { asset: 'OP' }),
|
|
48
|
+
decimals: v1_1.DEFAULT_ETHEREUM_UNITS_METADATA.ETH.decimals
|
|
49
49
|
} }),
|
|
50
50
|
mainUnit: 'ETH',
|
|
51
|
-
feeUnits: ethereum_1.DEFAULT_ETHEREUM_UNITS_METADATA,
|
|
52
|
-
mainFeeUnit: 'GWEI',
|
|
53
51
|
// The layer 2 gas price is normally 0.001 gwei, but it increases when experiencing heavy congestion
|
|
54
52
|
feeDefaults: {
|
|
55
|
-
low: (0, module_kit_1.newAmount)(15.75 /* 21000 GAS * 0.00075 GWEI */, 'GWEI').blockchain(
|
|
56
|
-
medium: (0, module_kit_1.newAmount)(22.05 /* 21000 GAS * 0.00105 GWEI */, 'GWEI').blockchain(
|
|
57
|
-
high: (0, module_kit_1.newAmount)(44.1 /* 21000 GAS * 0.0021 GWEI */, 'GWEI').blockchain(
|
|
53
|
+
low: (0, module_kit_1.newAmount)(15.75 /* 21000 GAS * 0.00075 GWEI */, 'GWEI').blockchain(v1_1.DEFAULT_ETHEREUM_UNITS_METADATA),
|
|
54
|
+
medium: (0, module_kit_1.newAmount)(22.05 /* 21000 GAS * 0.00105 GWEI */, 'GWEI').blockchain(v1_1.DEFAULT_ETHEREUM_UNITS_METADATA),
|
|
55
|
+
high: (0, module_kit_1.newAmount)(44.1 /* 21000 GAS * 0.0021 GWEI */, 'GWEI').blockchain(v1_1.DEFAULT_ETHEREUM_UNITS_METADATA)
|
|
58
56
|
}
|
|
59
57
|
};
|
|
60
|
-
var ethereumProtocol = new
|
|
58
|
+
var ethereumProtocol = new v1_1.EthereumBaseProtocolImpl(nodeClient, infoClient, baseProtocolOptions);
|
|
61
59
|
return _super.call(this, ethereumProtocol, nodeClient, infoClient, completeOptions) || this;
|
|
62
60
|
}
|
|
63
61
|
return OptimismProtocolImpl;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OptimismProtocol.js","sourceRoot":"","sources":["../../../src/v1/protocol/OptimismProtocol.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qDAA0D;AAC1D,
|
|
1
|
+
{"version":3,"file":"OptimismProtocol.js","sourceRoot":"","sources":["../../../src/v1/protocol/OptimismProtocol.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qDAA0D;AAC1D,0CAM4B;AAC5B,iDAAgE;AAEhE,gFAA8E;AAG9E,+DAAuF;AAMvF,iBAAiB;AAEjB;IAAmC,wCAAwB;IACzD,8BAAY,OAAkD;QAC5D,IAAM,eAAe,GAAG,6BAA6B,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;QAEtE,IAAM,UAAU,GAAG,IAAI,+CAAsB,CAAC,eAAe,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;QAC7E,IAAM,UAAU,GAAG,IAAI,wBAAmB,CAAC,eAAe,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAA;QAEpF,IAAM,mBAAmB,GAAwE;YAC/F,OAAO,EAAE,eAAe,CAAC,OAAO;YAEhC,UAAU,EAAE,kCAAmB,CAAC,QAAQ;YACxC,IAAI,EAAE,UAAU;YAEhB,KAAK,wBACA,oCAA+B,KAClC,GAAG,EAAE;oBACH,MAAM,wBAAO,oCAA+B,CAAC,GAAG,CAAC,MAAM,KAAE,KAAK,EAAE,IAAI,GAAE;oBACtE,QAAQ,EAAE,oCAA+B,CAAC,GAAG,CAAC,QAAQ;iBACvD,GACF;YACD,QAAQ,EAAE,KAAK;YAEf,oGAAoG;YACpG,WAAW,EAAE;gBACX,GAAG,EAAE,IAAA,sBAAS,EAAC,KAAK,CAAC,8BAA8B,EAAE,MAAM,CAAC,CAAC,UAAU,CAAC,oCAA+B,CAAC;gBACxG,MAAM,EAAE,IAAA,sBAAS,EAAC,KAAK,CAAC,8BAA8B,EAAE,MAAM,CAAC,CAAC,UAAU,CAAC,oCAA+B,CAAC;gBAC3G,IAAI,EAAE,IAAA,sBAAS,EAAC,IAAI,CAAC,6BAA6B,EAAE,MAAM,CAAC,CAAC,UAAU,CAAC,oCAA+B,CAAC;aACxG;SACF,CAAA;QAED,IAAM,gBAAgB,GAAG,IAAI,6BAAwB,CAAC,UAAU,EAAE,UAAU,EAAE,mBAAmB,CAAC,CAAA;eAElG,kBAAM,gBAAgB,EAAE,UAAU,EAAE,UAAU,EAAE,eAAe,CAAC;IAClE,CAAC;IACH,2BAAC;AAAD,CAAC,AAlCD,CAAmC,+CAAwB,GAkC1D;AAED,UAAU;AAEV,SAAgB,sBAAsB,CAAC,OAAuD;IAAvD,wBAAA,EAAA,YAAuD;IAC5F,OAAO,IAAI,oBAAoB,CAAC,OAAO,CAAC,CAAA;AAC1C,CAAC;AAFD,wDAEC;AAEY,QAAA,iCAAiC,GAA4B;IACxE,IAAI,EAAE,SAAS;IACf,IAAI,EAAE,SAAS;IACf,MAAM,EAAE,4CAA4C;IACpD,OAAO,EAAE,EAAE;IACX,gBAAgB,EAAE,iCAAiC;IACnD,gBAAgB,EAAE,+CAA+C;IACjE,qBAAqB,EAAE,4CAA4C;CACpE,CAAA;AAED,IAAM,iCAAiC,GAA4B,yCAAiC,CAAA;AAEpG,SAAgB,6BAA6B,CAAC,OAA8C;IAA9C,wBAAA,EAAA,YAA8C;IAC1F,OAAO;QACL,OAAO,wBAAO,iCAAiC,GAAK,OAAO,CAAE;KAC9D,CAAA;AACH,CAAC;AAJD,sEAIC"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
import { ERC20TokenMetadata, ERC20TokenOptions,
|
|
2
|
-
import { EthereumUnits } from '@airgap/ethereum';
|
|
1
|
+
import { ERC20TokenMetadata, ERC20TokenOptions, EthereumProtocolNetwork } from '@airgap/ethereum/v1';
|
|
3
2
|
import { AirGapInterface, RecursivePartial } from '@airgap/module-kit';
|
|
4
3
|
import { OptimismProtocolNetwork, OptimismProtocolOptions } from '../../types/protocol';
|
|
5
4
|
import { OptimismBaseProtocol } from '../OptimismBaseProtocol';
|
|
@@ -11,7 +10,7 @@ export interface ERC20Token extends AirGapInterface<OptimismBaseProtocol<string>
|
|
|
11
10
|
}
|
|
12
11
|
export declare function createERC20Token(metadata: ERC20TokenMetadata, options?: RecursivePartial<OptimismProtocolOptions>): ERC20Token;
|
|
13
12
|
export declare const OPTIMISM_ERC20_MAINNET_PROTOCOL_NETWORK: OptimismProtocolNetwork;
|
|
14
|
-
export declare function createERC20TokenOptions(metadata: ERC20TokenMetadata, network?: Partial<
|
|
13
|
+
export declare function createERC20TokenOptions(metadata: ERC20TokenMetadata, network?: Partial<EthereumProtocolNetwork>): ERC20TokenOptions<OptimismProtocolNetwork>;
|
|
15
14
|
export interface SerializedERC20Token {
|
|
16
15
|
metadata: ERC20TokenMetadata;
|
|
17
16
|
network: OptimismProtocolNetwork;
|
|
@@ -65,7 +65,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
65
65
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
66
66
|
exports.isSerializedERC20Token = exports.deserializeERC20Token = exports.serializeERC20Token = exports.createERC20TokenOptions = exports.OPTIMISM_ERC20_MAINNET_PROTOCOL_NETWORK = exports.createERC20Token = void 0;
|
|
67
67
|
var coinlib_core_1 = require("@airgap/coinlib-core");
|
|
68
|
-
var
|
|
68
|
+
var v1_1 = require("@airgap/ethereum/v1");
|
|
69
69
|
var module_kit_1 = require("@airgap/module-kit");
|
|
70
70
|
var HttpOptimismNodeClient_1 = require("../../client/node/HttpOptimismNodeClient");
|
|
71
71
|
var OptimismBaseProtocol_1 = require("../OptimismBaseProtocol");
|
|
@@ -75,8 +75,8 @@ var ERC20TokenImpl = /** @class */ (function (_super) {
|
|
|
75
75
|
__extends(ERC20TokenImpl, _super);
|
|
76
76
|
function ERC20TokenImpl(options) {
|
|
77
77
|
var nodeClient = new HttpOptimismNodeClient_1.HttpOptimismNodeClient(options.network.rpcUrl);
|
|
78
|
-
var infoClient = new
|
|
79
|
-
var ethereumProtocol = new
|
|
78
|
+
var infoClient = new v1_1.EtherscanInfoClient(options.network.blockExplorerApi);
|
|
79
|
+
var ethereumProtocol = new v1_1.ERC20TokenImpl(nodeClient, infoClient, options);
|
|
80
80
|
return _super.call(this, ethereumProtocol, nodeClient, infoClient, options) || this;
|
|
81
81
|
}
|
|
82
82
|
// SubProtocol
|
|
@@ -166,9 +166,7 @@ function createERC20TokenOptions(metadata, network) {
|
|
|
166
166
|
decimals: metadata.decimals
|
|
167
167
|
},
|
|
168
168
|
_a),
|
|
169
|
-
mainUnit: metadata.symbol
|
|
170
|
-
feeUnits: ethereum_1.DEFAULT_ETHEREUM_UNITS_METADATA,
|
|
171
|
-
mainFeeUnit: 'ETH'
|
|
169
|
+
mainUnit: metadata.symbol
|
|
172
170
|
};
|
|
173
171
|
}
|
|
174
172
|
exports.createERC20TokenOptions = createERC20TokenOptions;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ERC20Token.js","sourceRoot":"","sources":["../../../../src/v1/protocol/erc20/ERC20Token.ts"],"names":[],"mappings":";AAAA,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEV,qDAA0D;
|
|
1
|
+
{"version":3,"file":"ERC20Token.js","sourceRoot":"","sources":["../../../../src/v1/protocol/erc20/ERC20Token.ts"],"names":[],"mappings":";AAAA,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEV,qDAA0D;AAC1D,0CAM4B;AAC5B,iDAA2F;AAE3F,mFAAiF;AAEjF,gEAAwF;AACxF,wDAAuE;AAYvE,iBAAiB;AAEjB;IACU,kCAA6H;IAGrI,wBAAY,OAAmD;QAC7D,IAAM,UAAU,GAAG,IAAI,+CAAsB,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;QACrE,IAAM,UAAU,GAAG,IAAI,wBAAmB,CAAC,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAA;QAE5E,IAAM,gBAAgB,GAAG,IAAI,mBAAsB,CAAC,UAAU,EAAE,UAAU,EAAE,OAAO,CAAC,CAAA;eAEpF,kBAAM,gBAAgB,EAAE,UAAU,EAAE,UAAU,EAAE,OAAO,CAAC;IAC1D,CAAC;IAED,cAAc;IAED,gCAAO,GAApB;;;gBACE,sBAAO,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE,EAAA;;;KACvC;IAEY,qCAAY,GAAzB;;;gBACE,sBAAO,IAAI,CAAC,gBAAgB,CAAC,YAAY,EAAE,EAAA;;;KAC5C;IAEY,2CAAkB,GAA/B;;;gBACE,sBAAO,IAAI,CAAC,gBAAgB,CAAC,kBAAkB,EAAE,EAAA;;;KAClD;IAED,SAAS;IAEI,6BAAI,GAAjB;;;gBACE,sBAAO,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,EAAA;;;KACpC;IAEY,+BAAM,GAAnB;;;gBACE,sBAAO,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,EAAA;;;KACtC;IAEY,iCAAQ,GAArB;;;gBACE,sBAAO,IAAI,CAAC,gBAAgB,CAAC,QAAQ,EAAE,EAAA;;;KACxC;IAEY,sCAAa,GAA1B;;;;;gBACQ,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;gBAE1D,sBAAO;wBACL,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI;wBACvB,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU;wBACnC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,KAAK;wBAC7B,YAAY,EAAE,MAAA,QAAQ,CAAC,MAAM,CAAC,MAAM,mCAAI,QAAQ,CAAC,MAAM,CAAC,KAAK;wBAC7D,eAAe,EAAE,IAAI,CAAC,OAAO,CAAC,eAAe;wBAC7C,QAAQ,EAAE,QAAQ,CAAC,QAAQ;qBAC5B,EAAA;;;KACF;IACH,qBAAC;AAAD,CAAC,AArDD,CACU,+CAAwB,GAoDjC;AAED,UAAU;AAEV,SAAgB,gBAAgB,CAAC,QAA4B,EAAE,OAAuD;IAAvD,wBAAA,EAAA,YAAuD;IACpH,IAAM,eAAe,GAAG,uBAAuB,CAAC,QAAQ,EAAE,OAAO,CAAC,OAAO,CAAC,CAAA;IAE1E,OAAO,IAAI,cAAc,CAAC,eAAe,CAAC,CAAA;AAC5C,CAAC;AAJD,4CAIC;AAEY,QAAA,uCAAuC,GAA4B,oDAAiC,CAAA;AAEjH,IAAM,8BAA8B,GAA4B,+CAAuC,CAAA;AAEvG,SAAgB,uBAAuB,CACrC,QAA4B,EAC5B,OAA8C;;IAA9C,wBAAA,EAAA,YAA8C;IAE9C,OAAO;QACL,OAAO,wBAAO,8BAA8B,GAAK,OAAO,CAAE;QAC1D,IAAI,EAAE,QAAQ,CAAC,IAAI;QACnB,UAAU,EAAE,QAAQ,CAAC,UAAU;QAC/B,cAAc,EAAE,kCAAmB,CAAC,QAAQ;QAE5C,eAAe,EAAE,QAAQ,CAAC,eAAe;QAEzC,KAAK;YACH,GAAC,QAAQ,CAAC,MAAM,IAAG;gBACjB,MAAM,EAAE,EAAE,KAAK,EAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,YAAY,EAAE;gBACjE,QAAQ,EAAE,QAAQ,CAAC,QAAQ;aAC5B;eACF;QACD,QAAQ,EAAE,QAAQ,CAAC,MAAM;KAC1B,CAAA;AACH,CAAC;AApBD,0DAoBC;AASD,SAAsB,mBAAmB,CAAC,UAAsB;;;;;wBACkB,qBAAM,OAAO,CAAC,GAAG,CAAC;wBAChG,UAAU,CAAC,aAAa,EAAE;wBAC1B,UAAU,CAAC,UAAU,EAAE;qBACxB,CAAC,EAAA;;oBAHI,KAA0E,SAG9E,EAHK,aAAa,QAAA,EAAE,OAAO,QAAA;oBAK7B,sBAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,OAAO,SAAA,EAAE,EAAA;;;;CAC5C;AAPD,kDAOC;AAED,SAAgB,qBAAqB,CAAC,UAAgC;IACpE,OAAO,gBAAgB,CAAC,UAAU,CAAC,QAAQ,EAAE,EAAE,OAAO,EAAE,UAAU,CAAC,OAAO,EAAE,CAAC,CAAA;AAC/E,CAAC;AAFD,sDAEC;AAED,SAAgB,sBAAsB,CAAC,UAAmB;IACxD,OAAO,IAAA,gCAAmB,EAAuB,UAAU,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC,CAAA;AAC7G,CAAC;AAFD,wDAEC"}
|
|
@@ -12,11 +12,11 @@ var __assign = (this && this.__assign) || function () {
|
|
|
12
12
|
};
|
|
13
13
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
14
14
|
exports.optimismTransactionSignResponseToSigned = exports.optimismTransactionSignRequestToUnsigned = exports.optimismSignedTransactionToResponse = exports.optimismUnsignedTransactionToRequest = void 0;
|
|
15
|
-
var
|
|
15
|
+
var v1_1 = require("@airgap/ethereum/v1");
|
|
16
16
|
var module_kit_1 = require("@airgap/module-kit");
|
|
17
17
|
function optimismUnsignedTransactionToRequest(unsigned, publicKey, callbackUrl) {
|
|
18
|
-
var ethereumAnyTransactionSignRequest = (0,
|
|
19
|
-
if (unsigned.
|
|
18
|
+
var ethereumAnyTransactionSignRequest = (0, v1_1.ethereumUnsignedTransactionToRequest)(unsigned, publicKey, callbackUrl);
|
|
19
|
+
if (unsigned.ethereumType === 'raw') {
|
|
20
20
|
var ethereumTransactionSignRequest = ethereumAnyTransactionSignRequest;
|
|
21
21
|
var optimismTransactionSignRequest = __assign(__assign({}, ethereumTransactionSignRequest), { transaction: __assign(__assign({}, ethereumTransactionSignRequest.transaction), { l1DataFee: unsigned.l1DataFee }) });
|
|
22
22
|
return optimismTransactionSignRequest;
|
|
@@ -25,12 +25,12 @@ function optimismUnsignedTransactionToRequest(unsigned, publicKey, callbackUrl)
|
|
|
25
25
|
}
|
|
26
26
|
exports.optimismUnsignedTransactionToRequest = optimismUnsignedTransactionToRequest;
|
|
27
27
|
function optimismSignedTransactionToResponse(signed, accountIdentifier) {
|
|
28
|
-
return (0,
|
|
28
|
+
return (0, v1_1.ethereumSignedTransactionToResponse)(__assign(__assign({}, signed), { serialized: signed.l1DataFee ? JSON.stringify({ serialized: signed.serialized, l1DataFee: signed.l1DataFee }) : signed.serialized }), accountIdentifier);
|
|
29
29
|
}
|
|
30
30
|
exports.optimismSignedTransactionToResponse = optimismSignedTransactionToResponse;
|
|
31
31
|
function optimismTransactionSignRequestToUnsigned(request) {
|
|
32
|
-
var ethereumUnsignedTransaction = (0,
|
|
33
|
-
if (ethereumUnsignedTransaction.
|
|
32
|
+
var ethereumUnsignedTransaction = (0, v1_1.ethereumTransactionSignRequestToUnsigned)(request);
|
|
33
|
+
if (ethereumUnsignedTransaction.ethereumType === 'raw') {
|
|
34
34
|
var optimismRawRequest = request;
|
|
35
35
|
return (0, module_kit_1.newUnsignedTransaction)(__assign(__assign({}, ethereumUnsignedTransaction), { l1DataFee: optimismRawRequest.transaction.l1DataFee }));
|
|
36
36
|
}
|
|
@@ -38,7 +38,7 @@ function optimismTransactionSignRequestToUnsigned(request) {
|
|
|
38
38
|
}
|
|
39
39
|
exports.optimismTransactionSignRequestToUnsigned = optimismTransactionSignRequestToUnsigned;
|
|
40
40
|
function optimismTransactionSignResponseToSigned(response) {
|
|
41
|
-
var ethereumSignedTransaction = (0,
|
|
41
|
+
var ethereumSignedTransaction = (0, v1_1.ethereumTransactionSignResponseToSigned)(response);
|
|
42
42
|
try {
|
|
43
43
|
var _a = JSON.parse(ethereumSignedTransaction.serialized), serialized = _a.serialized, l1DataFee = _a.l1DataFee;
|
|
44
44
|
return (0, module_kit_1.newSignedTransaction)({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transaction-converter.js","sourceRoot":"","sources":["../../../../../../src/v1/serializer/v3/schemas/converter/transaction-converter.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"transaction-converter.js","sourceRoot":"","sources":["../../../../../../src/v1/serializer/v3/schemas/converter/transaction-converter.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,0CAM4B;AAC5B,iDAAiF;AAOjF,SAAgB,oCAAoC,CAClD,QAAqC,EACrC,SAAiB,EACjB,WAAoB;IAEpB,IAAM,iCAAiC,GAAG,IAAA,yCAAoC,EAAC,QAAQ,EAAE,SAAS,EAAE,WAAW,CAAC,CAAA;IAEhH,IAAI,QAAQ,CAAC,YAAY,KAAK,KAAK,EAAE;QACnC,IAAM,8BAA8B,GAAG,iCAAmE,CAAA;QAC1G,IAAM,8BAA8B,yBAC/B,8BAA8B,KACjC,WAAW,wBACN,8BAA8B,CAAC,WAAW,KAC7C,SAAS,EAAE,QAAQ,CAAC,SAAS,MAEhC,CAAA;QAED,OAAO,8BAA8B,CAAA;KACtC;IAED,OAAO,iCAAwE,CAAA;AACjF,CAAC;AArBD,oFAqBC;AAED,SAAgB,mCAAmC,CACjD,MAAiC,EACjC,iBAAyB;IAEzB,OAAO,IAAA,wCAAmC,wBAEnC,MAAM,KACT,UAAU,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,UAAU,EAAE,MAAM,CAAC,UAAU,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,KAEnI,iBAAiB,CAClB,CAAA;AACH,CAAC;AAXD,kFAWC;AAED,SAAgB,wCAAwC,CACtD,OAA6E;IAE7E,IAAM,2BAA2B,GAAG,IAAA,6CAAwC,EAAC,OAAO,CAAC,CAAA;IAErF,IAAI,2BAA2B,CAAC,YAAY,KAAK,KAAK,EAAE;QACtD,IAAM,kBAAkB,GAAG,OAAyC,CAAA;QACpE,OAAO,IAAA,mCAAsB,wBACxB,2BAA2B,KAC9B,SAAS,EAAE,kBAAkB,CAAC,WAAW,CAAC,SAAS,IACnD,CAAA;KACH;IAED,OAAO,2BAA2B,CAAA;AACpC,CAAC;AAdD,4FAcC;AAED,SAAgB,uCAAuC,CAAC,QAAyC;IAC/F,IAAM,yBAAyB,GAAG,IAAA,4CAAuC,EAAC,QAAQ,CAAC,CAAA;IAEnF,IAAI;QACI,IAAA,KAA4B,IAAI,CAAC,KAAK,CAAC,yBAAyB,CAAC,UAAU,CAAC,EAA1E,UAAU,gBAAA,EAAE,SAAS,eAAqD,CAAA;QAElF,OAAO,IAAA,iCAAoB,EAA4B;YACrD,UAAU,YAAA;YACV,SAAS,WAAA;SACV,CAAC,CAAA;KACH;IAAC,WAAM;QACN,OAAO,yBAAyB,CAAA;KACjC;AACH,CAAC;AAbD,0FAaC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import {
|
|
2
|
-
export interface OptimismTypedTransactionSignRequest extends
|
|
1
|
+
import { EthereumTypedTransactionSignRequest } from '@airgap/ethereum/v1';
|
|
2
|
+
export interface OptimismTypedTransactionSignRequest extends EthereumTypedTransactionSignRequest {
|
|
3
3
|
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { TransactionSignRequest } from '@airgap/serializer';
|
|
2
2
|
import { HexString } from '@airgap/serializer/v3/schemas/definitions/hex-string';
|
|
3
3
|
import { OptimismRawUnsignedTransaction } from '../../../../types/transaction';
|
|
4
|
-
export interface SerializableOptimismRawUnsignedTransaction extends Omit<OptimismRawUnsignedTransaction, 'type' | '
|
|
4
|
+
export interface SerializableOptimismRawUnsignedTransaction extends Omit<OptimismRawUnsignedTransaction, 'type' | 'ethereumType'> {
|
|
5
5
|
nonce: HexString;
|
|
6
6
|
gasPrice: HexString;
|
|
7
7
|
gasLimit: HexString;
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import {
|
|
2
|
-
export interface OptimismTransactionSignResponse extends
|
|
1
|
+
import { EthereumTransactionSignResponse } from '@airgap/ethereum/v1';
|
|
2
|
+
export interface OptimismTransactionSignResponse extends EthereumTransactionSignResponse {
|
|
3
3
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { EthereumTransactionValidator } from '@airgap/ethereum/v1';
|
|
2
2
|
import { TransactionValidator } from '@airgap/serializer';
|
|
3
|
-
export declare class OptimismTransactionValidator extends
|
|
3
|
+
export declare class OptimismTransactionValidator extends EthereumTransactionValidator implements TransactionValidator {
|
|
4
4
|
}
|
|
@@ -17,13 +17,13 @@ var __extends = (this && this.__extends) || (function () {
|
|
|
17
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
18
|
exports.OptimismTransactionValidator = void 0;
|
|
19
19
|
// tslint:disable: max-classes-per-file
|
|
20
|
-
var
|
|
20
|
+
var v1_1 = require("@airgap/ethereum/v1");
|
|
21
21
|
var OptimismTransactionValidator = /** @class */ (function (_super) {
|
|
22
22
|
__extends(OptimismTransactionValidator, _super);
|
|
23
23
|
function OptimismTransactionValidator() {
|
|
24
24
|
return _super !== null && _super.apply(this, arguments) || this;
|
|
25
25
|
}
|
|
26
26
|
return OptimismTransactionValidator;
|
|
27
|
-
}(
|
|
27
|
+
}(v1_1.EthereumTransactionValidator));
|
|
28
28
|
exports.OptimismTransactionValidator = OptimismTransactionValidator;
|
|
29
29
|
//# sourceMappingURL=transaction-validator.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transaction-validator.js","sourceRoot":"","sources":["../../../../../src/v1/serializer/v3/validators/transaction-validator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,uCAAuC;AACvC,
|
|
1
|
+
{"version":3,"file":"transaction-validator.js","sourceRoot":"","sources":["../../../../../src/v1/serializer/v3/validators/transaction-validator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,uCAAuC;AACvC,0CAAkE;AAGlE;IAAkD,gDAA4B;IAA9E;;IAAgH,CAAC;IAAD,mCAAC;AAAD,CAAC,AAAjH,CAAkD,iCAA4B,GAAmC;AAApG,oEAA4B"}
|
package/v1/types/crypto.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import {
|
|
2
|
-
export declare type OptimismCryptoConfiguration =
|
|
1
|
+
import { EthereumCryptoConfiguration } from '@airgap/ethereum/v1';
|
|
2
|
+
export declare type OptimismCryptoConfiguration = EthereumCryptoConfiguration;
|
package/v1/types/protocol.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import {
|
|
2
|
-
export interface OptimismProtocolNetwork extends
|
|
1
|
+
import { EthereumProtocolNetwork, EthereumProtocolOptions } from '@airgap/ethereum/v1';
|
|
2
|
+
export interface OptimismProtocolNetwork extends EthereumProtocolNetwork {
|
|
3
3
|
gasPriceOracleAddress: string;
|
|
4
4
|
}
|
|
5
|
-
export interface OptimismProtocolOptions extends
|
|
5
|
+
export interface OptimismProtocolOptions extends EthereumProtocolOptions<OptimismProtocolNetwork> {
|
|
6
6
|
}
|
|
@@ -1,11 +1,10 @@
|
|
|
1
|
-
import {
|
|
2
|
-
|
|
3
|
-
export interface OptimismRawUnsignedTransaction extends EvmRawUnsignedTransaction {
|
|
1
|
+
import { EthereumRawUnsignedTransaction, EthereumSignedTransaction, EthereumTransactionCursor, EthereumTypedUnsignedTransaction } from '@airgap/ethereum/v1';
|
|
2
|
+
export interface OptimismRawUnsignedTransaction extends EthereumRawUnsignedTransaction {
|
|
4
3
|
l1DataFee: string;
|
|
5
4
|
}
|
|
6
|
-
export declare type OptimismTypedUnsignedTransaction =
|
|
5
|
+
export declare type OptimismTypedUnsignedTransaction = EthereumTypedUnsignedTransaction;
|
|
7
6
|
export declare type OptimismUnsignedTransaction = OptimismRawUnsignedTransaction | OptimismTypedUnsignedTransaction;
|
|
8
|
-
export interface OptimismSignedTransaction extends
|
|
7
|
+
export interface OptimismSignedTransaction extends EthereumSignedTransaction {
|
|
9
8
|
l1DataFee?: string;
|
|
10
9
|
}
|
|
11
10
|
export declare type OptimismTransactionCursor = EthereumTransactionCursor;
|