@0xsequence/provider 0.0.0-20230727132905 → 0.0.0-20230801185244

package/dist/0xsequence-provider.cjs.dev.js

@@ -2107,6 +2107,25 @@ function fromExtended(transaction) {
   return [transaction, ...(transaction.auxiliary || [])];
 }
 
+function validateTransactionRequest(wallet, transaction) {
+  const transactions = core.commons.transaction.fromTransactionish(wallet, transaction);
+  const unwound = core.commons.transaction.unwind(wallet, transactions);
+  unwound.forEach(transaction => validateTransaction(wallet, transaction));
+}
+function validateTransaction(wallet, transaction) {
+  if (transaction.to.toLowerCase() === wallet.toLowerCase()) {
+    if (transaction.data) {
+      const data = ethers.ethers.utils.arrayify(transaction.data);
+      if (data.length >= 4) {
+        throw new Error('self calls are forbidden');
+      }
+    }
+  }
+  if (transaction.delegateCall) {
+    throw new Error('delegate calls are forbidden');
+  }
+}
+
 const SIGNER_READY_TIMEOUT = 10000;
 class WalletRequestHandler {
   constructor(_account, prompter, networks) {
@@ -2297,6 +2316,7 @@ class WalletRequestHandler {
                 }
                 return tx;
               });
+              validateTransactionRequest(account.address, transactionParams);
               let txnHash = '';
               if (_this.prompter === null) {
                 // prompter is null, so we'll send from here
@@ -2322,6 +2342,7 @@ class WalletRequestHandler {
               if (sender !== account.address) {
                 throw new Error('sender address does not match wallet');
               }
+              validateTransactionRequest(account.address, transaction);
               if (_this.prompter === null) {
                 // The eth_signTransaction method expects a `string` return value we instead return a `SignedTransactions` object,
                 // this can only be broadcasted using an RPC provider with support for signed Sequence transactions, like this one.
@@ -3254,7 +3275,7 @@ class SequenceProvider extends ethers.ethers.providers.BaseProvider {
     var _provider$prepareRequ;
     // First we check if the method should be handled by the client
     if (method === 'eth_chainId') {
-      return this.useChainId();
+      return `0x${(await this.useChainId()).toString(16)}`;
     }
     if (method === 'eth_accounts') {
       return [this.client.getAddress()];

package/dist/0xsequence-provider.cjs.prod.js

@@ -2107,6 +2107,25 @@ function fromExtended(transaction) {
   return [transaction, ...(transaction.auxiliary || [])];
 }
 
+function validateTransactionRequest(wallet, transaction) {
+  const transactions = core.commons.transaction.fromTransactionish(wallet, transaction);
+  const unwound = core.commons.transaction.unwind(wallet, transactions);
+  unwound.forEach(transaction => validateTransaction(wallet, transaction));
+}
+function validateTransaction(wallet, transaction) {
+  if (transaction.to.toLowerCase() === wallet.toLowerCase()) {
+    if (transaction.data) {
+      const data = ethers.ethers.utils.arrayify(transaction.data);
+      if (data.length >= 4) {
+        throw new Error('self calls are forbidden');
+      }
+    }
+  }
+  if (transaction.delegateCall) {
+    throw new Error('delegate calls are forbidden');
+  }
+}
+
 const SIGNER_READY_TIMEOUT = 10000;
 class WalletRequestHandler {
   constructor(_account, prompter, networks) {
@@ -2297,6 +2316,7 @@ class WalletRequestHandler {
                 }
                 return tx;
               });
+              validateTransactionRequest(account.address, transactionParams);
               let txnHash = '';
               if (_this.prompter === null) {
                 // prompter is null, so we'll send from here
@@ -2322,6 +2342,7 @@ class WalletRequestHandler {
               if (sender !== account.address) {
                 throw new Error('sender address does not match wallet');
               }
+              validateTransactionRequest(account.address, transaction);
               if (_this.prompter === null) {
                 // The eth_signTransaction method expects a `string` return value we instead return a `SignedTransactions` object,
                 // this can only be broadcasted using an RPC provider with support for signed Sequence transactions, like this one.
@@ -3254,7 +3275,7 @@ class SequenceProvider extends ethers.ethers.providers.BaseProvider {
     var _provider$prepareRequ;
     // First we check if the method should be handled by the client
     if (method === 'eth_chainId') {
-      return this.useChainId();
+      return `0x${(await this.useChainId()).toString(16)}`;
     }
     if (method === 'eth_accounts') {
       return [this.client.getAddress()];

package/dist/0xsequence-provider.esm.js

@@ -2103,6 +2103,25 @@ function fromExtended(transaction) {
   return [transaction, ...(transaction.auxiliary || [])];
 }
 
+function validateTransactionRequest(wallet, transaction) {
+  const transactions = commons.transaction.fromTransactionish(wallet, transaction);
+  const unwound = commons.transaction.unwind(wallet, transactions);
+  unwound.forEach(transaction => validateTransaction(wallet, transaction));
+}
+function validateTransaction(wallet, transaction) {
+  if (transaction.to.toLowerCase() === wallet.toLowerCase()) {
+    if (transaction.data) {
+      const data = ethers.utils.arrayify(transaction.data);
+      if (data.length >= 4) {
+        throw new Error('self calls are forbidden');
+      }
+    }
+  }
+  if (transaction.delegateCall) {
+    throw new Error('delegate calls are forbidden');
+  }
+}
+
 const SIGNER_READY_TIMEOUT = 10000;
 class WalletRequestHandler {
   constructor(_account, prompter, networks) {
@@ -2293,6 +2312,7 @@ class WalletRequestHandler {
                 }
                 return tx;
               });
+              validateTransactionRequest(account.address, transactionParams);
               let txnHash = '';
               if (_this.prompter === null) {
                 // prompter is null, so we'll send from here
@@ -2318,6 +2338,7 @@ class WalletRequestHandler {
               if (sender !== account.address) {
                 throw new Error('sender address does not match wallet');
               }
+              validateTransactionRequest(account.address, transaction);
               if (_this.prompter === null) {
                 // The eth_signTransaction method expects a `string` return value we instead return a `SignedTransactions` object,
                 // this can only be broadcasted using an RPC provider with support for signed Sequence transactions, like this one.
@@ -3250,7 +3271,7 @@ class SequenceProvider extends ethers.providers.BaseProvider {
     var _provider$prepareRequ;
     // First we check if the method should be handled by the client
     if (method === 'eth_chainId') {
-      return this.useChainId();
+      return `0x${(await this.useChainId()).toString(16)}`;
     }
     if (method === 'eth_accounts') {
       return [this.client.getAddress()];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@0xsequence/provider",
-  "version": "0.0.0-20230727132905",
+  "version": "0.0.0-20230801185244",
   "description": "provider sub-package for Sequence",
   "repository": "https://github.com/0xsequence/sequence.js/tree/master/packages/provider",
   "source": "src/index.ts",
@@ -11,15 +11,15 @@
   "dependencies": {
     "eventemitter2": "^6.4.5",
     "webextension-polyfill": "^0.10.0",
-    "@0xsequence/account": "0.0.0-20230727132905",
-    "@0xsequence/core": "0.0.0-20230727132905",
-    "@0xsequence/abi": "0.0.0-20230727132905",
-    "@0xsequence/auth": "0.0.0-20230727132905",
-    "@0xsequence/migration": "0.0.0-20230727132905",
-    "@0xsequence/network": "0.0.0-20230727132905",
-    "@0xsequence/utils": "0.0.0-20230727132905",
-    "@0xsequence/relayer": "0.0.0-20230727132905",
-    "@0xsequence/wallet": "0.0.0-20230727132905"
+    "@0xsequence/account": "0.0.0-20230801185244",
+    "@0xsequence/abi": "0.0.0-20230801185244",
+    "@0xsequence/core": "0.0.0-20230801185244",
+    "@0xsequence/auth": "0.0.0-20230801185244",
+    "@0xsequence/migration": "0.0.0-20230801185244",
+    "@0xsequence/network": "0.0.0-20230801185244",
+    "@0xsequence/relayer": "0.0.0-20230801185244",
+    "@0xsequence/utils": "0.0.0-20230801185244",
+    "@0xsequence/wallet": "0.0.0-20230801185244"
   },
   "peerDependencies": {
     "ethers": ">=5.5 < 6"

package/src/provider.ts

@@ -247,7 +247,7 @@ export class SequenceProvider extends ethers.providers.BaseProvider implements I
   async perform(method: string, params: any): Promise<any> {
     // First we check if the method should be handled by the client
     if (method === 'eth_chainId') {
-      return this.useChainId()
+      return `0x${(await this.useChainId()).toString(16)}`
     }
 
     if (method === 'eth_accounts') {

package/src/transactions.ts

@@ -0,0 +1,23 @@
+import { commons } from '@0xsequence/core'
+import { ethers } from 'ethers'
+
+export function validateTransactionRequest(wallet: string, transaction: commons.transaction.Transactionish) {
+  const transactions = commons.transaction.fromTransactionish(wallet, transaction)
+  const unwound = commons.transaction.unwind(wallet, transactions)
+  unwound.forEach(transaction => validateTransaction(wallet, transaction))
+}
+
+function validateTransaction(wallet: string, transaction: commons.transaction.Transaction) {
+  if (transaction.to.toLowerCase() === wallet.toLowerCase()) {
+    if (transaction.data) {
+      const data = ethers.utils.arrayify(transaction.data)
+      if (data.length >= 4) {
+        throw new Error('self calls are forbidden')
+      }
+    }
+  }
+
+  if (transaction.delegateCall) {
+    throw new Error('delegate calls are forbidden')
+  }
+}

package/src/transports/wallet-request-handler.ts

@@ -7,6 +7,7 @@ import { BigNumber, ethers, providers } from 'ethers'
 import { EventEmitter2 as EventEmitter } from 'eventemitter2'
 
 import { fromExtended } from '../extended'
+import { validateTransactionRequest } from '../transactions'
 import {
   ProviderMessageRequest,
   ProviderMessageResponse,
@@ -393,6 +394,8 @@ export class WalletRequestHandler implements ExternalProvider, JsonRpcHandler, P
               return tx
             })
 
+          validateTransactionRequest(account.address, transactionParams)
+
           let txnHash = ''
           if (this.prompter === null) {
             // prompter is null, so we'll send from here
@@ -421,6 +424,8 @@ export class WalletRequestHandler implements ExternalProvider, JsonRpcHandler, P
             throw new Error('sender address does not match wallet')
           }
 
+          validateTransactionRequest(account.address, transaction)
+
           if (this.prompter === null) {
             // The eth_signTransaction method expects a `string` return value we instead return a `SignedTransactions` object,
             // this can only be broadcasted using an RPC provider with support for signed Sequence transactions, like this one.