@airgap/optimism 0.13.15-beta.11 → 0.13.16-beta.0

package/v1/serializer/v3/schemas/converter/transaction-converter.js

@@ -1,21 +1,54 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.optimismTransactionSignResponseToSigned = exports.optimismTransactionSignRequestToUnsigned = exports.optimismSignedTransactionToResponse = exports.optimismUnsignedTransactionToRequest = void 0;
 var v1_1 = require("@airgap/ethereum/v1");
+var module_kit_1 = require("@airgap/module-kit");
 function optimismUnsignedTransactionToRequest(unsigned, publicKey, callbackUrl) {
-    return (0, v1_1.ethereumUnsignedTransactionToRequest)(unsigned, publicKey, callbackUrl);
+    var ethereumAnyTransactionSignRequest = (0, v1_1.ethereumUnsignedTransactionToRequest)(unsigned, publicKey, callbackUrl);
+    if (unsigned.ethereumType === 'raw') {
+        var ethereumTransactionSignRequest = ethereumAnyTransactionSignRequest;
+        var optimismTransactionSignRequest = __assign(__assign({}, ethereumTransactionSignRequest), { transaction: __assign(__assign({}, ethereumTransactionSignRequest.transaction), { l1DataFee: unsigned.l1DataFee }) });
+        return optimismTransactionSignRequest;
+    }
+    return ethereumAnyTransactionSignRequest;
 }
 exports.optimismUnsignedTransactionToRequest = optimismUnsignedTransactionToRequest;
 function optimismSignedTransactionToResponse(signed, accountIdentifier) {
-    return (0, v1_1.ethereumSignedTransactionToResponse)(signed, accountIdentifier);
+    return (0, v1_1.ethereumSignedTransactionToResponse)(__assign(__assign({}, signed), { serialized: JSON.stringify({ serialized: signed.serialized, l1DataFee: signed.l1DataFee }) }), accountIdentifier);
 }
 exports.optimismSignedTransactionToResponse = optimismSignedTransactionToResponse;
 function optimismTransactionSignRequestToUnsigned(request) {
-    return (0, v1_1.ethereumTransactionSignRequestToUnsigned)(request);
+    var ethereumUnsignedTransaction = (0, v1_1.ethereumTransactionSignRequestToUnsigned)(request);
+    if (ethereumUnsignedTransaction.ethereumType === 'raw') {
+        var optimismRawRequest = request;
+        return (0, module_kit_1.newUnsignedTransaction)(__assign(__assign({}, ethereumUnsignedTransaction), { l1DataFee: optimismRawRequest.transaction.l1DataFee }));
+    }
+    return ethereumUnsignedTransaction;
 }
 exports.optimismTransactionSignRequestToUnsigned = optimismTransactionSignRequestToUnsigned;
 function optimismTransactionSignResponseToSigned(response) {
-    return (0, v1_1.ethereumTransactionSignResponseToSigned)(response);
+    var ethereumSignedTransaction = (0, v1_1.ethereumTransactionSignResponseToSigned)(response);
+    try {
+        var _a = JSON.parse(ethereumSignedTransaction.serialized), serialized = _a.serialized, l1DataFee = _a.l1DataFee;
+        return (0, module_kit_1.newSignedTransaction)({
+            serialized: serialized,
+            l1DataFee: l1DataFee
+        });
+    }
+    catch (_b) {
+        return ethereumSignedTransaction;
+    }
 }
 exports.optimismTransactionSignResponseToSigned = optimismTransactionSignResponseToSigned;
 //# sourceMappingURL=transaction-converter.js.map

package/v1/serializer/v3/schemas/converter/transaction-converter.js.map

@@ -1 +1 @@
-{"version":3,"file":"transaction-converter.js","sourceRoot":"","sources":["../../../../../../src/v1/serializer/v3/schemas/converter/transaction-converter.ts"],"names":[],"mappings":";;;AAAA,0CAK4B;AAO5B,SAAgB,oCAAoC,CAClD,QAAqC,EACrC,SAAiB,EACjB,WAAoB;IAEpB,OAAO,IAAA,yCAAoC,EAAC,QAAQ,EAAE,SAAS,EAAE,WAAW,CAAC,CAAA;AAC/E,CAAC;AAND,oFAMC;AAED,SAAgB,mCAAmC,CACjD,MAAiC,EACjC,iBAAyB;IAEzB,OAAO,IAAA,wCAAmC,EAAC,MAAM,EAAE,iBAAiB,CAAC,CAAA;AACvE,CAAC;AALD,kFAKC;AAED,SAAgB,wCAAwC,CACtD,OAA6E;IAE7E,OAAO,IAAA,6CAAwC,EAAC,OAAO,CAAC,CAAA;AAC1D,CAAC;AAJD,4FAIC;AAED,SAAgB,uCAAuC,CAAC,QAAyC;IAC/F,OAAO,IAAA,4CAAuC,EAAC,QAAQ,CAAC,CAAA;AAC1D,CAAC;AAFD,0FAEC"}
+{"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,IAAI,CAAC,SAAS,CAAC,EAAE,UAAU,EAAE,MAAM,CAAC,UAAU,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,CAAC,KAE5F,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"}

package/v1/serializer/v3/schemas/definitions/transaction-sign-request-optimism.d.ts

@@ -1,3 +1,15 @@
-import { EthereumTransactionSignRequest } from '@airgap/ethereum/v1';
-export interface OptimismTransactionSignRequest extends EthereumTransactionSignRequest {
+import { TransactionSignRequest } from '@airgap/serializer';
+import { HexString } from '@airgap/serializer/v3/schemas/definitions/hex-string';
+import { OptimismRawUnsignedTransaction } from '../../../../types/transaction';
+export interface SerializableOptimismRawUnsignedTransaction extends Omit<OptimismRawUnsignedTransaction, 'type' | 'ethereumType'> {
+    nonce: HexString;
+    gasPrice: HexString;
+    gasLimit: HexString;
+    to: HexString;
+    value: HexString;
+    chainId: number;
+    data: HexString;
+    l1DataFee: string;
+}
+export interface OptimismTransactionSignRequest extends TransactionSignRequest<SerializableOptimismRawUnsignedTransaction> {
 }

package/v1/serializer/v3/schemas/generated/transaction-sign-request-optimism-typed.json

@@ -15,28 +15,25 @@
           "type": "string"
         },
         "transaction": {
-          "$ref": "#/definitions/SerializableEthereumTypedUnsignedTransaction"
+          "additionalProperties": false,
+          "properties": {
+            "derivationPath": {
+              "type": "string"
+            },
+            "masterFingerprint": {
+              "type": "string"
+            },
+            "serialized": {
+              "$ref": "#/definitions/HexString",
+              "type": "string"
+            }
+          },
+          "required": ["derivationPath", "masterFingerprint", "serialized"],
+          "type": "object"
         }
       },
       "required": ["publicKey", "transaction"],
       "type": "object"
-    },
-    "SerializableEthereumTypedUnsignedTransaction": {
-      "additionalProperties": false,
-      "properties": {
-        "derivationPath": {
-          "type": "string"
-        },
-        "masterFingerprint": {
-          "type": "string"
-        },
-        "serialized": {
-          "$ref": "#/definitions/HexString",
-          "type": "string"
-        }
-      },
-      "required": ["derivationPath", "masterFingerprint", "serialized"],
-      "type": "object"
     }
   }
 }

package/v1/serializer/v3/schemas/generated/transaction-sign-request-optimism.json

@@ -15,45 +15,45 @@
           "type": "string"
         },
         "transaction": {
-          "$ref": "#/definitions/SerializableEthereumRawUnsignedTransaction"
+          "additionalProperties": false,
+          "properties": {
+            "chainId": {
+              "type": "number"
+            },
+            "data": {
+              "$ref": "#/definitions/HexString",
+              "type": "string"
+            },
+            "gasLimit": {
+              "$ref": "#/definitions/HexString",
+              "type": "string"
+            },
+            "gasPrice": {
+              "$ref": "#/definitions/HexString",
+              "type": "string"
+            },
+            "l1DataFee": {
+              "type": "string"
+            },
+            "nonce": {
+              "$ref": "#/definitions/HexString",
+              "type": "string"
+            },
+            "to": {
+              "$ref": "#/definitions/HexString",
+              "type": "string"
+            },
+            "value": {
+              "$ref": "#/definitions/HexString",
+              "type": "string"
+            }
+          },
+          "required": ["chainId", "data", "gasLimit", "gasPrice", "l1DataFee", "nonce", "to", "value"],
+          "type": "object"
         }
       },
       "required": ["publicKey", "transaction"],
       "type": "object"
-    },
-    "SerializableEthereumRawUnsignedTransaction": {
-      "additionalProperties": false,
-      "properties": {
-        "chainId": {
-          "type": "number"
-        },
-        "data": {
-          "$ref": "#/definitions/HexString",
-          "type": "string"
-        },
-        "gasLimit": {
-          "$ref": "#/definitions/HexString",
-          "type": "string"
-        },
-        "gasPrice": {
-          "$ref": "#/definitions/HexString",
-          "type": "string"
-        },
-        "nonce": {
-          "$ref": "#/definitions/HexString",
-          "type": "string"
-        },
-        "to": {
-          "$ref": "#/definitions/HexString",
-          "type": "string"
-        },
-        "value": {
-          "$ref": "#/definitions/HexString",
-          "type": "string"
-        }
-      },
-      "required": ["chainId", "data", "gasLimit", "gasPrice", "nonce", "to", "value"],
-      "type": "object"
     }
   }
 }

package/v1/types/crypto.d.ts

@@ -0,0 +1,2 @@
+import { EthereumCryptoConfiguration } from '@airgap/ethereum/src/v1';
+export declare type OptimismCryptoConfiguration = EthereumCryptoConfiguration;

package/v1/types/crypto.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=crypto.js.map

package/v1/types/crypto.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"crypto.js","sourceRoot":"","sources":["../../../src/v1/types/crypto.ts"],"names":[],"mappings":""}

package/v1/types/protocol.d.ts

@@ -1,8 +1,6 @@
 import { EthereumProtocolNetwork, EthereumProtocolOptions } from '@airgap/ethereum/v1';
-export declare type OptimismUnits = 'OP';
 export interface OptimismProtocolNetwork extends EthereumProtocolNetwork {
-    contractAddress: string;
+    gasPriceOracleAddress: string;
 }
-export interface OptimismProtocolOptions extends EthereumProtocolOptions {
-    network: OptimismProtocolNetwork;
+export interface OptimismProtocolOptions extends EthereumProtocolOptions<OptimismProtocolNetwork> {
 }

package/v1/types/transaction.d.ts

@@ -1,4 +1,10 @@
-import { EthereumSignedTransaction, EthereumUnsignedTransaction } from '@airgap/ethereum/v1';
-export declare type OptimismUnsignedTransaction = EthereumUnsignedTransaction;
+import { EthereumRawUnsignedTransaction, EthereumSignedTransaction, EthereumTransactionCursor, EthereumTypedUnsignedTransaction } from '@airgap/ethereum/v1';
+export interface OptimismRawUnsignedTransaction extends EthereumRawUnsignedTransaction {
+    l1DataFee: string;
+}
+export declare type OptimismTypedUnsignedTransaction = EthereumTypedUnsignedTransaction;
+export declare type OptimismUnsignedTransaction = OptimismRawUnsignedTransaction | OptimismTypedUnsignedTransaction;
 export interface OptimismSignedTransaction extends EthereumSignedTransaction {
+    l1DataFee?: string;
 }
+export declare type OptimismTransactionCursor = EthereumTransactionCursor;