From 3ddda8e1779571aff0598e9525e84ef7228a6fb3 Mon Sep 17 00:00:00 2001 From: Marcelo Date: Fri, 18 Jun 2021 02:30:05 +0200 Subject: [PATCH 1/2] Parse type field in Receipts This was introduced in [EIP-2930](https://eips.ethereum.org/EIPS/eip-2930) --- packages/providers/lib/formatter.d.ts.map | 2 +- packages/providers/lib/formatter.js | 3 ++- packages/providers/lib/formatter.js.map | 2 +- packages/providers/src.ts/formatter.ts | 3 ++- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/providers/lib/formatter.d.ts.map b/packages/providers/lib/formatter.d.ts.map index 5f718ac4a8..cab7985879 100644 --- a/packages/providers/lib/formatter.d.ts.map +++ b/packages/providers/lib/formatter.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"formatter.d.ts","sourceRoot":"","sources":["../src.ts/formatter.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AAElG,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAIrD,OAAO,EAAE,UAAU,EAA4C,MAAM,6BAA6B,CAAC;AAMnG,oBAAY,UAAU,GAAG,CAAC,KAAK,EAAE,GAAG,KAAK,GAAG,CAAC;AAE7C,oBAAY,WAAW,GAAG;IAAE,CAAE,GAAG,EAAE,MAAM,GAAI,UAAU,CAAA;CAAE,CAAC;AAE1D,oBAAY,OAAO,GAAG;IAClB,WAAW,EAAE,WAAW,CAAC;IACzB,kBAAkB,EAAE,WAAW,CAAC;IAChC,OAAO,EAAE,WAAW,CAAC;IACrB,UAAU,EAAE,WAAW,CAAC;IACxB,KAAK,EAAE,WAAW,CAAC;IACnB,qBAAqB,EAAE,WAAW,CAAC;IACnC,MAAM,EAAE,WAAW,CAAC;IACpB,SAAS,EAAE,WAAW,CAAC;CAC1B,CAAC;AAEF,qBAAa,SAAS;IAClB,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;;IAO1B,iBAAiB,IAAI,OAAO;IAoI5B,UAAU,CAAC,UAAU,EAAE,KAAK,CAAC,GAAG,CAAC,GAAG,UAAU;IAM9C,MAAM,CAAC,MAAM,EAAE,GAAG,GAAG,MAAM;IAM3B,SAAS,CAAC,KAAK,EAAE,GAAG,GAAG,SAAS;IAKhC,OAAO,CAAC,KAAK,EAAE,GAAG,GAAG,OAAO;IAU5B,GAAG,CAAC,KAAK,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,MAAM;IAUzC,IAAI,CAAC,KAAK,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,MAAM;IAU1C,OAAO,CAAC,KAAK,EAAE,GAAG,GAAG,MAAM;IAI3B,WAAW,CAAC,KAAK,EAAE,GAAG,GAAG,MAAM;IAM/B,eAAe,CAAC,KAAK,EAAE,GAAG,GAAG,MAAM;IAKnC,QAAQ,CAAC,QAAQ,EAAE,GAAG,GAAG,MAAM;IAiB/B,IAAI,CAAC,KAAK,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,MAAM;IAS1C,UAAU,CAAC,KAAK,EAAE,GAAG,GAAG,MAAM;IAY9B,OAAO,CAAC,KAAK,EAAE,GAAG,GAAG,MAAM;IAO3B,MAAM,CAAC,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,GAAG,KAAK;IAOtC,KAAK,CAAC,KAAK,EAAE,GAAG,GAAG,KAAK;IAIxB,qBAAqB,CAAC,KAAK,EAAE,GAAG,GAAG,KAAK;IAKxC,kBAAkB,CAAC,KAAK,EAAE,GAAG,GAAG,GAAG;IAInC,mBAAmB,CAAC,WAAW,EAAE,GAAG,GAAG,mBAAmB;IAqE1D,WAAW,CAAC,KAAK,EAAE,GAAG,GAAG,GAAG;IAI5B,UAAU,CAAC,KAAK,EAAE,GAAG,GAAG,GAAG;IAI3B,OAAO,CAAC,KAAK,EAAE,GAAG,GAAG,kBAAkB;IA+BvC,MAAM,CAAC,KAAK,EAAE,GAAG,GAAG,GAAG;IAWvB,MAAM,CAAC,KAAK,EAAE,GAAG,GAAG,GAAG;IAIvB,SAAS,CAAC,KAAK,EAAE,GAAG,GAAG,GAAG;IAI1B,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE;QAAE,CAAE,IAAI,EAAE,MAAM,GAAI,UAAU,CAAA;KAAE,EAAE,MAAM,EAAE,GAAG,GAAG,GAAG;IAgBxE,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,UAAU,EAAE,SAAS,CAAC,EAAE,GAAG,GAAG,UAAU;IAQjE,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,UAAU,EAAE,YAAY,EAAE,GAAG,GAAG,UAAU;IAQtE,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,UAAU,GAAG,UAAU;CAajD;AAED,MAAM,WAAW,oBAAoB;IACjC,mBAAmB,IAAI,OAAO,CAAC;CAClC;AAED,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,GAAG,GAAG,KAAK,IAAI,oBAAoB,CAEhF;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,GAAG,GAAG,OAAO,CAEvD;AAID,wBAAgB,mBAAmB,SAgBlC"} \ No newline at end of file +{"version":3,"file":"formatter.d.ts","sourceRoot":"","sources":["../src.ts/formatter.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/packages/providers/lib/formatter.js b/packages/providers/lib/formatter.js index 240359e34b..adcccaff86 100644 --- a/packages/providers/lib/formatter.js +++ b/packages/providers/lib/formatter.js @@ -84,7 +84,8 @@ var Formatter = /** @class */ (function () { blockNumber: number, confirmations: Formatter.allowNull(number, null), cumulativeGasUsed: bigNumber, - status: Formatter.allowNull(number) + status: Formatter.allowNull(number), + type: Formatter.allowNull(number) }; formats.block = { hash: hash, diff --git a/packages/providers/lib/formatter.js.map b/packages/providers/lib/formatter.js.map index 32f0fa4472..eae384496d 100644 --- a/packages/providers/lib/formatter.js.map +++ b/packages/providers/lib/formatter.js.map @@ -1 +1 @@ -{"version":3,"file":"formatter.js","sourceRoot":"","sources":["../src.ts/formatter.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"formatter.js","sourceRoot":"","sources":["../src.ts/formatter.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/packages/providers/src.ts/formatter.ts b/packages/providers/src.ts/formatter.ts index a36370bfa6..72d8493a40 100644 --- a/packages/providers/src.ts/formatter.ts +++ b/packages/providers/src.ts/formatter.ts @@ -116,7 +116,8 @@ export class Formatter { blockNumber: number, confirmations: Formatter.allowNull(number, null), cumulativeGasUsed: bigNumber, - status: Formatter.allowNull(number) + status: Formatter.allowNull(number), + type: Formatter.allowNull(number) }; formats.block = { From b9f43e1d7ffbe59309876b849429c60a922b902e Mon Sep 17 00:00:00 2001 From: Marcelo Date: Fri, 18 Jun 2021 02:50:03 +0200 Subject: [PATCH 2/2] Update signature of the class --- packages/abstract-provider/lib/index.d.ts | 1 + packages/abstract-provider/lib/index.d.ts.map | 2 +- packages/abstract-provider/lib/index.js.map | 2 +- packages/abstract-provider/src.ts/index.ts | 3 ++- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/abstract-provider/lib/index.d.ts b/packages/abstract-provider/lib/index.d.ts index 603ebf48cf..baa90f79e0 100644 --- a/packages/abstract-provider/lib/index.d.ts +++ b/packages/abstract-provider/lib/index.d.ts @@ -72,6 +72,7 @@ export interface TransactionReceipt { cumulativeGasUsed: BigNumber; byzantium: boolean; status?: number; + type?: number; } export interface EventFilter { address?: string; diff --git a/packages/abstract-provider/lib/index.d.ts.map b/packages/abstract-provider/lib/index.d.ts.map index 924d889db9..81d82ebaa9 100644 --- a/packages/abstract-provider/lib/index.d.ts.map +++ b/packages/abstract-provider/lib/index.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src.ts/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src.ts/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/packages/abstract-provider/lib/index.js.map b/packages/abstract-provider/lib/index.js.map index 42ba414ddd..5fa4d09156 100644 --- a/packages/abstract-provider/lib/index.js.map +++ b/packages/abstract-provider/lib/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../src.ts/index.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;;;;;;;;;;;;;;;;AAGb,8CAA8D;AAE9D,wDAAoF;AAIpF,gDAA+C;AAC/C,uCAAqC;AACrC,IAAM,MAAM,GAAG,IAAI,eAAM,CAAC,kBAAO,CAAC,CAAC;AAwClC,CAAC;AA6DD,CAAC;AAgBF,qCAAqC;AACrC,0EAA0E;AAC1E,IAAI;AAEJ;IAAwC,6BAAW;IAAnD;;IAQA,CAAC;IAHU,qBAAW,GAAlB,UAAmB,KAAU;QACzB,OAAO,CAAC,CAAC,CAAC,KAAK,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC;IAC3C,CAAC;IACL,gBAAC;AAAD,CAAC,AARD,CAAwC,wBAAW,GAQlD;AARqB,8BAAS;AAU/B;IAAoC,kCAAS;IAKzC,wBAAY,SAAiB,EAAE,MAAe;QAA9C,iBAWC;QAVG,IAAI,CAAC,mBAAW,CAAC,SAAS,EAAE,EAAE,CAAC,EAAE;YAC7B,MAAM,CAAC,kBAAkB,CAAC,mBAAmB,EAAE,WAAW,EAAE,SAAS,CAAC,CAAC;SAC1E;QAED,QAAA,kBAAM;YACF,YAAY,EAAE,IAAI;YAClB,iBAAiB,EAAE,IAAI;YACvB,MAAM,EAAE,CAAC,MAAM,IAAI,CAAC,CAAC;YACrB,SAAS,EAAE,SAAS;SACvB,CAAC,SAAC;;IACP,CAAC;IACL,qBAAC;AAAD,CAAC,AAjBD,CAAoC,SAAS,GAiB5C;AAjBY,wCAAc;AAmB3B;IAA0C,wCAAS;IAK/C,8BAAY,IAAY,EAAE,MAAe;QAAzC,iBAWC;QAVG,IAAI,CAAC,mBAAW,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE;YACxB,MAAM,CAAC,kBAAkB,CAAC,0BAA0B,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;SACvE;QAED,QAAA,kBAAM;YACF,YAAY,EAAE,IAAI;YAClB,uBAAuB,EAAE,IAAI;YAC7B,MAAM,EAAE,CAAC,MAAM,IAAI,CAAC,CAAC;YACrB,IAAI,EAAE,IAAI;SACb,CAAC,SAAC;;IACP,CAAC;IACL,2BAAC;AAAD,CAAC,AAjBD,CAA0C,SAAS,GAiBlD;AAjBY,oDAAoB;AAmBjC;IAA+C,6CAAS;IAIpD,mCAAY,UAAkB,EAAE,SAAiB,EAAE,MAAe;QAAlE,iBAeC;QAdG,IAAI,CAAC,mBAAW,CAAC,UAAU,EAAE,EAAE,CAAC,EAAE;YAC9B,MAAM,CAAC,kBAAkB,CAAC,0BAA0B,EAAE,YAAY,EAAE,UAAU,CAAC,CAAC;SACnF;QACD,IAAI,CAAC,mBAAW,CAAC,SAAS,EAAE,EAAE,CAAC,EAAE;YAC7B,MAAM,CAAC,kBAAkB,CAAC,0BAA0B,EAAE,WAAW,EAAE,SAAS,CAAC,CAAC;SACjF;QAED,QAAA,kBAAM;YACF,YAAY,EAAE,IAAI;YAClB,4BAA4B,EAAE,IAAI;YAClC,MAAM,EAAE,CAAC,MAAM,IAAI,CAAC,CAAC;YACrB,UAAU,EAAE,UAAU;YACtB,SAAS,EAAE,SAAS;SACvB,CAAC,SAAC;;IACP,CAAC;IACL,gCAAC;AAAD,CAAC,AApBD,CAA+C,SAAS,GAoBvD;AApBY,8DAAyB;AA0BtC,+BAA+B;AAC/B,qBAAqB;AAErB;IAyDI;;QACI,MAAM,CAAC,aAAa,aAAa,QAAQ,CAAC,CAAC;QAC3C,2BAAc,CAAC,IAAI,EAAE,aAAa,EAAE,IAAI,CAAC,CAAC;IAC9C,CAAC;IAlBD,iBAAiB;IACjB,8BAAW,GAAX,UAAY,SAAoB,EAAE,QAAkB;QAChD,OAAO,IAAI,CAAC,EAAE,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;IACxC,CAAC;IAED,kBAAkB;IAClB,iCAAc,GAAd,UAAe,SAAoB,EAAE,QAAkB;QACnD,OAAO,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;IACzC,CAAC;IAYM,mBAAU,GAAjB,UAAkB,KAAU;QACxB,OAAO,CAAC,CAAC,CAAC,KAAK,IAAI,KAAK,CAAC,WAAW,CAAC,CAAC;IAC1C,CAAC;IAyCL,eAAC;AAAD,CAAC,AAzGD,IAyGC;AAzGqB,4BAAQ"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../src.ts/index.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;;;;;;;;;;;;;;;;AAGb,8CAA8D;AAE9D,wDAAoF;AAIpF,gDAA+C;AAC/C,uCAAqC;AACrC,IAAM,MAAM,GAAG,IAAI,eAAM,CAAC,kBAAO,CAAC,CAAC;AAwClC,CAAC;AA8DD,CAAC;AAgBF,qCAAqC;AACrC,0EAA0E;AAC1E,IAAI;AAEJ;IAAwC,6BAAW;IAAnD;;IAQA,CAAC;IAHU,qBAAW,GAAlB,UAAmB,KAAU;QACzB,OAAO,CAAC,CAAC,CAAC,KAAK,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC;IAC3C,CAAC;IACL,gBAAC;AAAD,CAAC,AARD,CAAwC,wBAAW,GAQlD;AARqB,8BAAS;AAU/B;IAAoC,kCAAS;IAKzC,wBAAY,SAAiB,EAAE,MAAe;QAA9C,iBAWC;QAVG,IAAI,CAAC,mBAAW,CAAC,SAAS,EAAE,EAAE,CAAC,EAAE;YAC7B,MAAM,CAAC,kBAAkB,CAAC,mBAAmB,EAAE,WAAW,EAAE,SAAS,CAAC,CAAC;SAC1E;QAED,QAAA,kBAAM;YACF,YAAY,EAAE,IAAI;YAClB,iBAAiB,EAAE,IAAI;YACvB,MAAM,EAAE,CAAC,MAAM,IAAI,CAAC,CAAC;YACrB,SAAS,EAAE,SAAS;SACvB,CAAC,SAAC;;IACP,CAAC;IACL,qBAAC;AAAD,CAAC,AAjBD,CAAoC,SAAS,GAiB5C;AAjBY,wCAAc;AAmB3B;IAA0C,wCAAS;IAK/C,8BAAY,IAAY,EAAE,MAAe;QAAzC,iBAWC;QAVG,IAAI,CAAC,mBAAW,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE;YACxB,MAAM,CAAC,kBAAkB,CAAC,0BAA0B,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;SACvE;QAED,QAAA,kBAAM;YACF,YAAY,EAAE,IAAI;YAClB,uBAAuB,EAAE,IAAI;YAC7B,MAAM,EAAE,CAAC,MAAM,IAAI,CAAC,CAAC;YACrB,IAAI,EAAE,IAAI;SACb,CAAC,SAAC;;IACP,CAAC;IACL,2BAAC;AAAD,CAAC,AAjBD,CAA0C,SAAS,GAiBlD;AAjBY,oDAAoB;AAmBjC;IAA+C,6CAAS;IAIpD,mCAAY,UAAkB,EAAE,SAAiB,EAAE,MAAe;QAAlE,iBAeC;QAdG,IAAI,CAAC,mBAAW,CAAC,UAAU,EAAE,EAAE,CAAC,EAAE;YAC9B,MAAM,CAAC,kBAAkB,CAAC,0BAA0B,EAAE,YAAY,EAAE,UAAU,CAAC,CAAC;SACnF;QACD,IAAI,CAAC,mBAAW,CAAC,SAAS,EAAE,EAAE,CAAC,EAAE;YAC7B,MAAM,CAAC,kBAAkB,CAAC,0BAA0B,EAAE,WAAW,EAAE,SAAS,CAAC,CAAC;SACjF;QAED,QAAA,kBAAM;YACF,YAAY,EAAE,IAAI;YAClB,4BAA4B,EAAE,IAAI;YAClC,MAAM,EAAE,CAAC,MAAM,IAAI,CAAC,CAAC;YACrB,UAAU,EAAE,UAAU;YACtB,SAAS,EAAE,SAAS;SACvB,CAAC,SAAC;;IACP,CAAC;IACL,gCAAC;AAAD,CAAC,AApBD,CAA+C,SAAS,GAoBvD;AApBY,8DAAyB;AA0BtC,+BAA+B;AAC/B,qBAAqB;AAErB;IAyDI;;QACI,MAAM,CAAC,aAAa,aAAa,QAAQ,CAAC,CAAC;QAC3C,2BAAc,CAAC,IAAI,EAAE,aAAa,EAAE,IAAI,CAAC,CAAC;IAC9C,CAAC;IAlBD,iBAAiB;IACjB,8BAAW,GAAX,UAAY,SAAoB,EAAE,QAAkB;QAChD,OAAO,IAAI,CAAC,EAAE,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;IACxC,CAAC;IAED,kBAAkB;IAClB,iCAAc,GAAd,UAAe,SAAoB,EAAE,QAAkB;QACnD,OAAO,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;IACzC,CAAC;IAYM,mBAAU,GAAjB,UAAkB,KAAU;QACxB,OAAO,CAAC,CAAC,CAAC,KAAK,IAAI,KAAK,CAAC,WAAW,CAAC,CAAC;IAC1C,CAAC;IAyCL,eAAC;AAAD,CAAC,AAzGD,IAyGC;AAzGqB,4BAAQ"} \ No newline at end of file diff --git a/packages/abstract-provider/src.ts/index.ts b/packages/abstract-provider/src.ts/index.ts index 98116c1b2f..921cb25cb8 100644 --- a/packages/abstract-provider/src.ts/index.ts +++ b/packages/abstract-provider/src.ts/index.ts @@ -109,7 +109,8 @@ export interface TransactionReceipt { confirmations: number, cumulativeGasUsed: BigNumber, byzantium: boolean, - status?: number + status?: number, + type?: number }; export interface EventFilter {