@polkadot/extension-base 0.41.3-3 → 0.41.3-4

package/background/handlers/Extension.test.cjs

@@ -48,15 +48,23 @@ describe('Extension', () => {
     return new _Extension.default(state);
   }
 
-  const createAccount = async () => {
-    await extension.handle('id', 'pri(accounts.create.suri)', {
+  const createAccount = async type => {
+    await extension.handle('id', 'pri(accounts.create.suri)', type && type === 'ethereum' ? {
+      name: 'parent',
+      password,
+      suri,
+      type
+    } : {
       name: 'parent',
       password,
       suri
     }, {});
     const {
       address
-    } = await extension.handle('id', 'pri(seed.validate)', {
+    } = await extension.handle('id', 'pri(seed.validate)', type && type === 'ethereum' ? {
+      suri,
+      type
+    } : {
       suri
     }, {});
     return address;
@@ -175,7 +183,7 @@ describe('Extension', () => {
         nonce: '0x0000000000000000',
         signedExtensions: ['CheckSpecVersion', 'CheckTxVersion', 'CheckGenesis', 'CheckMortality', 'CheckNonce', 'CheckWeight', 'ChargeTransactionPayment'],
         specVersion: '0x00000026',
-        tip: null,
+        tip: '0x00000000000000000000000000000000',
         transactionVersion: '0x00000005',
         version: 4
       };
@@ -195,6 +203,40 @@ describe('Extension', () => {
         savePass: false
       }, {})).resolves.toEqual(true);
     });
+    test('signs with default signed extensions - ethereum', async () => {
+      const ethAddress = await createAccount('ethereum');
+
+      const ethPair = _uiKeyring.default.getPair(ethAddress);
+
+      ethPair.decodePkcs8(password);
+      const ethPayload = {
+        address: ethAddress,
+        blockHash: '0xf9fc354edc3ff49f43d5e2c14e3c609a0c4ba469ed091edf893d672993dc9bc0',
+        blockNumber: '0x00000393',
+        era: '0x3601',
+        genesisHash: '0xf9fc354edc3ff49f43d5e2c14e3c609a0c4ba469ed091edf893d672993dc9bc0',
+        method: '0x03003cd0a705a2dc65e5b1e1205896baa2be8a07c6e0070010a5d4e8',
+        nonce: '0x00000000',
+        signedExtensions: ['CheckSpecVersion', 'CheckTxVersion', 'CheckGenesis', 'CheckMortality', 'CheckNonce', 'CheckWeight', 'ChargeTransactionPayment'],
+        specVersion: '0x000003e9',
+        tip: '0x00000000000000000000000000000000',
+        transactionVersion: '0x00000002',
+        version: 4
+      };
+      const registry = new _types.TypeRegistry();
+      registry.setSignedExtensions(payload.signedExtensions);
+      const signatureExpected = registry.createType('ExtrinsicPayload', ethPayload, {
+        version: ethPayload.version
+      }).sign(ethPair);
+      tabs.handle('1615191860871.5', 'pub(extrinsic.sign)', ethPayload, 'http://localhost:3000', {}).then(result => {
+        expect(result === null || result === void 0 ? void 0 : result.signature).toEqual(signatureExpected.signature);
+      }).catch(err => console.log(err));
+      await expect(extension.handle('1615192072290.7', 'pri(signing.approve.password)', {
+        id: state.allSignRequests[0].id,
+        password,
+        savePass: false
+      }, {})).resolves.toEqual(true);
+    });
     test('signs with user extensions, known types', async () => {
       const types = {};
       const userExtensions = {
@@ -228,7 +270,7 @@ describe('Extension', () => {
         nonce: '0x0000000000000000',
         signedExtensions: ['MyUserExtension'],
         specVersion: '0x00000026',
-        tip: null,
+        tip: '0x00000000000000000000000000000000',
         transactionVersion: '0x00000005',
         version: 4
       };

package/background/handlers/Extension.test.js

@@ -34,15 +34,23 @@ describe('Extension', () => {
     return new Extension(state);
   }
 
-  const createAccount = async () => {
-    await extension.handle('id', 'pri(accounts.create.suri)', {
+  const createAccount = async type => {
+    await extension.handle('id', 'pri(accounts.create.suri)', type && type === 'ethereum' ? {
+      name: 'parent',
+      password,
+      suri,
+      type
+    } : {
       name: 'parent',
       password,
       suri
     }, {});
     const {
       address
-    } = await extension.handle('id', 'pri(seed.validate)', {
+    } = await extension.handle('id', 'pri(seed.validate)', type && type === 'ethereum' ? {
+      suri,
+      type
+    } : {
       suri
     }, {});
     return address;
@@ -158,7 +166,7 @@ describe('Extension', () => {
         nonce: '0x0000000000000000',
         signedExtensions: ['CheckSpecVersion', 'CheckTxVersion', 'CheckGenesis', 'CheckMortality', 'CheckNonce', 'CheckWeight', 'ChargeTransactionPayment'],
         specVersion: '0x00000026',
-        tip: null,
+        tip: '0x00000000000000000000000000000000',
         transactionVersion: '0x00000005',
         version: 4
       };
@@ -178,6 +186,38 @@ describe('Extension', () => {
         savePass: false
       }, {})).resolves.toEqual(true);
     });
+    test('signs with default signed extensions - ethereum', async () => {
+      const ethAddress = await createAccount('ethereum');
+      const ethPair = keyring.getPair(ethAddress);
+      ethPair.decodePkcs8(password);
+      const ethPayload = {
+        address: ethAddress,
+        blockHash: '0xf9fc354edc3ff49f43d5e2c14e3c609a0c4ba469ed091edf893d672993dc9bc0',
+        blockNumber: '0x00000393',
+        era: '0x3601',
+        genesisHash: '0xf9fc354edc3ff49f43d5e2c14e3c609a0c4ba469ed091edf893d672993dc9bc0',
+        method: '0x03003cd0a705a2dc65e5b1e1205896baa2be8a07c6e0070010a5d4e8',
+        nonce: '0x00000000',
+        signedExtensions: ['CheckSpecVersion', 'CheckTxVersion', 'CheckGenesis', 'CheckMortality', 'CheckNonce', 'CheckWeight', 'ChargeTransactionPayment'],
+        specVersion: '0x000003e9',
+        tip: '0x00000000000000000000000000000000',
+        transactionVersion: '0x00000002',
+        version: 4
+      };
+      const registry = new TypeRegistry();
+      registry.setSignedExtensions(payload.signedExtensions);
+      const signatureExpected = registry.createType('ExtrinsicPayload', ethPayload, {
+        version: ethPayload.version
+      }).sign(ethPair);
+      tabs.handle('1615191860871.5', 'pub(extrinsic.sign)', ethPayload, 'http://localhost:3000', {}).then(result => {
+        expect(result === null || result === void 0 ? void 0 : result.signature).toEqual(signatureExpected.signature);
+      }).catch(err => console.log(err));
+      await expect(extension.handle('1615192072290.7', 'pri(signing.approve.password)', {
+        id: state.allSignRequests[0].id,
+        password,
+        savePass: false
+      }, {})).resolves.toEqual(true);
+    });
     test('signs with user extensions, known types', async () => {
       const types = {};
       const userExtensions = {
@@ -211,7 +251,7 @@ describe('Extension', () => {
         nonce: '0x0000000000000000',
         signedExtensions: ['MyUserExtension'],
         specVersion: '0x00000026',
-        tip: null,
+        tip: '0x00000000000000000000000000000000',
         transactionVersion: '0x00000005',
         version: 4
       };

package/package.json

@@ -14,13 +14,13 @@
   },
   "sideEffects": false,
   "type": "module",
-  "version": "0.41.3-3",
+  "version": "0.41.3-4",
   "main": "index.js",
   "dependencies": {
     "@babel/runtime": "^7.16.3",
     "@polkadot/api": "^6.11.1",
-    "@polkadot/extension-dapp": "^0.41.3-3",
-    "@polkadot/extension-inject": "^0.41.3-3",
+    "@polkadot/extension-dapp": "^0.41.3-4",
+    "@polkadot/extension-inject": "^0.41.3-4",
     "@polkadot/keyring": "^8.1.2",
     "@polkadot/phishing": "^0.6.510",
     "@polkadot/ui-keyring": "^0.87.5"

package/packageInfo.cjs

@@ -9,6 +9,6 @@ exports.packageInfo = void 0;
 // Auto-generated by @polkadot/dev, do not edit
 const packageInfo = {
   name: '@polkadot/extension-base',
-  version: '0.41.3-3'
+  version: '0.41.3-4'
 };
 exports.packageInfo = packageInfo;

package/packageInfo.js

@@ -3,5 +3,5 @@
 // Auto-generated by @polkadot/dev, do not edit
 export const packageInfo = {
   name: '@polkadot/extension-base',
-  version: '0.41.3-3'
+  version: '0.41.3-4'
 };