Support Implicit signals

README.md

@@ -149,20 +149,21 @@ The following is a list of contracts that are deployed by this script.
 | SequenceMarketV2               | 0xfdb42A198a932C8D3B506Ffa5e855bC4b348a712 |
 | SequenceMarketV1               | 0xB537a160472183f2150d42EB1c3DD6684A55f74c |
 | BatchPayableHelper             | 0x6166c1952c54dEd6b070B4616797E61b6c48A117 |
-| ERC20ItemsFactory              | 0x1063cBEe6b3Cd69B49f1B922A0D402f484b39855 |
+| ERC20ItemsFactory              | 0x434c9C50b0Ca6b67AbB71F667C822d5451265062 |
 | ERC721ItemsFactory             | 0xC6064FfBaDB0687Da29721C8EC02ACa71e735a3e |
-| ERC1155ItemsFactory            | 0x7364fDEFe24385B2b3869504383c94cF083AcbD6 |
-| ERC721SaleFactory              | 0xc412172a99e657609f5f7D4b9Bea37684B8eEE4E |
-| ERC1155SaleFactory             | 0x52A6E7236A01B72eeb262d58F7270cb9AeD8Db4B |
-| ERC721SoulboundFactory         | 0x2fBFF6fd3C978ab1bBd21b878262c5289a14b6c1 |
-| ERC1155SoulboundFactory        | 0xaB069C041FaCAB8f4D747D91EEda5705b5caAB76 |
+| ERC1155ItemsFactory            | 0x024b9949FeD1c8dd7154DE653456d64Aa1093384 |
+| ERC721SaleFactory              | 0x2Ce46243FAb9d688CcC2B1F1B8D2c464e87A2076 |
+| ERC1155SaleFactory             | 0xFb89C8A7DF9A1e0299088C3fC46fd87D3FcbcDBd |
+| ERC721SoulboundFactory         | 0x718476DcFf820113B30fE4196905c7720F3c8a4e |
+| ERC1155SoulboundFactory        | 0xCCbB517AaCAb6680A2ad08ef5A593677dDE17284 |
 | ERC1155PackFactory             | 0x5B2f47ee798eee52cE184C9eC4d60873185836d8 |
 | ERC721OperatorEnforcedFactory  | 0x5fD880b092bD285873b16335a454D11c062a4689 |
 | ERC1155OperatorEnforcedFactory | 0xc89f63389ef3B53D07649D52D47F9E4afcAbb1fB |
 | Clawback                       | 0x6F9a2c3E11011b894fae691d5338748f8048467d |
 | ClawbackMetadata               | 0x335411eAA9D63251f8c0867600Be4d0C190a3b1f |
 | PaymentCombiner                | 0xfe0a269E288051B0815E05Fe192FC888118CB8a2 |
 | PaymentsFactory                | 0xdC8dC7d7F0AAfbc5901DA779Ed5aab779F3E7c14 |
+| ValueForwarder                 | 0xABAAd93EeE2a569cF0632f39B10A9f5D734777ca |
 | SequencePaymentsSigner-dev     | 0x498399DD85CAa29A42Af499f82b271f1629ba0D7 |
 | SequencePayments-dev           | 0xDE280948Af8A9762B6984995C8c3c7F5AEB921Bf |
 | SequencePaymentsSigner-next    | 0x51805F2d8719a833C28EAc68aE881B2Eb70c0330 |

scripts/deploy-contracts.ts

@@ -16,9 +16,9 @@ import { SequenceMarketV1 } from './factories/marketplace/SequenceMarketV1'
 import { Clawback } from './factories/token_library/Clawback'
 import { ClawbackMetadata } from './factories/token_library/ClawbackMetadata'
 import { ERC1155ItemsFactory } from './factories/token_library/ERC1155ItemsFactory'
+import { ERC1155PackFactory } from './factories/token_library/ERC1155PackFactory'
 import { ERC1155SaleFactory } from './factories/token_library/ERC1155SaleFactory'
 import { ERC1155SoulboundFactory } from './factories/token_library/ERC1155SoulboundFactory'
-import { ERC1155PackFactory } from './factories/token_library/ERC1155PackFactory'
 import { ERC20ItemsFactory } from './factories/token_library/ERC20ItemsFactory'
 import { ERC721ItemsFactory } from './factories/token_library/ERC721ItemsFactory'
 import { ERC721SaleFactory } from './factories/token_library/ERC721SaleFactory'
@@ -27,6 +27,7 @@ import { ERC1155OperatorEnforcedFactory } from './factories/token_library/immuta
 import { ERC721OperatorEnforcedFactory } from './factories/token_library/immutable/ERC721OperatorEnforcedFactory'
 import { PaymentCombiner } from './factories/token_library/PaymentCombiner'
 import { PaymentsFactory } from './factories/token_library/PaymentsFactory'
+import { ValueForwarder } from './factories/token_library/ValueForwarder'
 import {
   FactoryV1,
   GuestModuleV1,
@@ -314,6 +315,8 @@ export const deployContracts = async (config: Config): Promise<string | null> =>
 
     prompt.start('Deploying Sequence Payments contracts\n')
 
+    const valueForwarder = await singletonDeployer.deploy('ValueForwarder', ValueForwarder, 0, txParams)
+
     const paymentCombiner = await singletonDeployer.deploy('PaymentCombiner', PaymentCombiner, 0, txParams)
 
     type PaymentsDeployment = {
@@ -507,6 +510,7 @@ export const deployContracts = async (config: Config): Promise<string | null> =>
       ClawbackMetadata: clawbackMetadata.address,
       PaymentCombiner: paymentCombiner.address,
       PaymentsFactory: paymentsFactory.address,
+      ValueForwarder: valueForwarder.address,
       ERC1155PackFactory: erc1155PackFactory.address
     }
     for (const { env, signerAddr, paymentsAddr } of paymentsDeployments) {
@@ -521,8 +525,31 @@ export const deployContracts = async (config: Config): Promise<string | null> =>
     await verifyContracts(config, contractEntries)
   } catch (error: unknown) {
     console.error('Error deploying contracts on', config.networkName, error)
+
+    // Check for insufficient funds error
+    const errorMessage = (error as Error).message ?? ''
+    const fundsErrorMatches = [
+      /insufficient funds for gas \* price \+ value: balance (\d+), tx cost (\d+), overshot (\d+)/i,
+      /insufficient funds for gas \* price \+ value:.*?have (\d+) want (\d+)/i
+    ]
+
+    for (const pattern of fundsErrorMatches) {
+      const match = errorMessage.match(pattern)
+      if (match) {
+        try {
+          const balance = BigNumber.from(match[1])
+          const txCost = BigNumber.from(match[2])
+          const shortMessage = `Insufficient funds: need ${ethers.utils.formatEther(txCost)} native tokens, have ${ethers.utils.formatEther(balance)} native tokens`
+          prompt.fail(`Error deploying contracts on ${config.networkName}: ${shortMessage}`)
+          return shortMessage
+        } catch (error) {
+          console.error('Error parsing funds error message:', error)
+        }
+      }
+    }
+
     prompt.fail(`Error deploying contracts on ${config.networkName}: ${error}`)
-    return (error as Error).message
+    return errorMessage
   }
   return null
 }