Develop -> Master

.changeset/fast-actors-allow.md

@@ -0,0 +1,5 @@
+---
+'@eth-optimism/l2geth': patch
+---
+
+Fix `eth_getBlockRange`

.changeset/gorgeous-squids-speak.md

@@ -0,0 +1,5 @@
+---
+'@eth-optimism/l2geth': patch
+---
+
+Add system addresses for nightly goerli

.changeset/seven-poets-search.md

@@ -0,0 +1,5 @@
+---
+'@eth-optimism/contracts': patch
+---
+
+Add Teleportr mainnet deployment

.changeset/tasty-adults-explode.md

@@ -0,0 +1,5 @@
+---
+'@eth-optimism/core-utils': patch
+---
+
+Add a `calldataCost` function that computes the cost of calldata

.changeset/twelve-suits-camp.md

@@ -0,0 +1,5 @@
+---
+'@eth-optimism/integration-tests': patch
+---
+
+Fix various actor tests

.changeset/warm-points-enjoy.md

@@ -0,0 +1,5 @@
+---
+'@eth-optimism/core-utils': patch
+---
+
+Adds a one-liner for getting chain ID from provider

integration-tests/actor-tests/README.md

@@ -49,10 +49,11 @@ actor('Value sender', () => {
 
   setupRun(async () => {
     const wallet = Wallet.createRandom()
-    await env.l2Wallet.sendTransaction({
+    const tx = await env.l2Wallet.sendTransaction({
       to: wallet.address,
       value: utils.parseEther('0.01'),
     })
+    await tx.wait()
     return {
       wallet: wallet.connect(env.l2Wallet.provider),
     }
@@ -61,10 +62,11 @@ actor('Value sender', () => {
   run(async (b, ctx: Context) => {
     const randWallet = Wallet.createRandom().connect(env.l2Wallet.provider)
     await b.bench('send funds', async () => {
-      await ctx.wallet.sendTransaction({
+      const tx = await ctx.wallet.sendTransaction({
         to: randWallet.address,
         value: 0x42,
       })
+      await tx.wait()
     })
     expect(await randWallet.getBalance()).to.deep.equal(BigNumber.from(0x42))
   })
@@ -163,4 +165,4 @@ actor_successful_actor_runs_total{actor_name="value_sender"} 40
 
 # HELP actor_failed_actor_runs_total Count of total failed actor runs.
 # TYPE actor_failed_actor_runs_total counter
-```
+```

integration-tests/actor-tests/deposits.test.ts

@@ -21,10 +21,11 @@ actor('Funds depositor', () => {
 
   setupRun(async () => {
     const wallet = Wallet.createRandom()
-    await env.l1Wallet.sendTransaction({
+    const tx = await env.l1Wallet.sendTransaction({
       to: wallet.address,
       value: utils.parseEther('0.01'),
     })
+    await tx.wait()
     return {
       l1Wallet: wallet.connect(env.l1Wallet.provider),
       l2Wallet: wallet.connect(env.l2Wallet.provider),
@@ -36,16 +37,18 @@ actor('Funds depositor', () => {
     const balBefore = await l2Wallet.getBalance()
     await b.bench('deposit', async () => {
       await env.waitForXDomainTransaction(
-        env.l1Bridge
+        env.messenger.contracts.l1.L1StandardBridge
           .connect(l1Wallet)
           .depositETH(DEFAULT_TEST_GAS_L2, '0xFFFF', {
             value: 0x42,
             gasLimit: DEFAULT_TEST_GAS_L1,
           })
       )
     })
-    expect((await l2Wallet.getBalance()).sub(balBefore)).to.deep.equal(
-      BigNumber.from(0x42)
+    // Converting BigNumber to hex string prevents chai from incorrectly considering inherited properties
+    // for strict equality - https://github.com/chaijs/chai/issues/948
+    expect((await l2Wallet.getBalance()).sub(balBefore).toString()).to.deep.equal(
+      BigNumber.from(0x42).toString()
     )
   })
 })

integration-tests/actor-tests/nft.test.ts

@@ -22,10 +22,11 @@ actor('NFT claimer', () => {
 
   setupRun(async () => {
     const wallet = Wallet.createRandom().connect(env.l2Wallet.provider)
-    await env.l2Wallet.sendTransaction({
+    const tx = await env.l2Wallet.sendTransaction({
       to: wallet.address,
       value: utils.parseEther('0.01'),
     })
+    await tx.wait()
     return {
       wallet,
       contract: contract.connect(wallet),

integration-tests/actor-tests/sends.test.ts

@@ -17,10 +17,11 @@ actor('Value sender', () => {
 
   setupRun(async () => {
     const wallet = Wallet.createRandom()
-    await env.l2Wallet.sendTransaction({
+    const tx = await env.l2Wallet.sendTransaction({
       to: wallet.address,
       value: utils.parseEther('0.01'),
     })
+    await tx.wait()
     return {
       wallet: wallet.connect(env.l2Wallet.provider),
     }
@@ -29,10 +30,11 @@ actor('Value sender', () => {
   run(async (b, ctx: Context) => {
     const randWallet = Wallet.createRandom().connect(env.l2Wallet.provider)
     await b.bench('send funds', async () => {
-      await ctx.wallet.sendTransaction({
+      const tx = await ctx.wallet.sendTransaction({
         to: randWallet.address,
         value: 0x42,
       })
+      await tx.wait()
     })
     expect((await randWallet.getBalance()).toString()).to.deep.equal('66')
   })

integration-tests/actor-tests/state-dos.test.ts

@@ -24,10 +24,11 @@ actor('Trie DoS accounts', () => {
 
   setupRun(async () => {
     const wallet = Wallet.createRandom()
-    await env.l2Wallet.sendTransaction({
+    const tx = await env.l2Wallet.sendTransaction({
       to: wallet.address,
       value: utils.parseEther('1'),
     })
+    await tx.wait()
     return {
       wallet: wallet.connect(env.l2Wallet.provider),
     }

integration-tests/actor-tests/uniswap.test.ts

@@ -50,10 +50,11 @@ actor('Uniswap swapper', () => {
   setupRun(async () => {
     const wallet = Wallet.createRandom().connect(env.l2Provider)
 
-    await env.l2Wallet.sendTransaction({
+    const sendTx = await env.l2Wallet.sendTransaction({
       to: wallet.address,
       value: utils.parseEther('0.1'),
     })
+    await sendTx.wait()
 
     for (const token of tokens) {
       let tx = await token.transfer(wallet.address, 1000000)

l2geth/internal/ethapi/api.go

@@ -51,8 +51,9 @@ import (
 )
 
 var (
-	errNoSequencerURL = errors.New("sequencer transaction forwarding not configured")
-	errStillSyncing   = errors.New("sequencer still syncing, cannot accept transactions")
+	errNoSequencerURL  = errors.New("sequencer transaction forwarding not configured")
+	errStillSyncing    = errors.New("sequencer still syncing, cannot accept transactions")
+	errBlockNotIndexed = errors.New("block in range not indexed, this should never happen")
 )
 
 const (
@@ -780,9 +781,12 @@ func (s *PublicBlockChainAPI) GetBlockRange(ctx context.Context, startNumber rpc
 	// For each block in range, get block and append to array.
 	for number := startNumber; number <= endNumber; number++ {
 		block, err := s.GetBlockByNumber(ctx, number, fullTx)
-		if block == nil || err != nil {
+		if err != nil {
 			return nil, err
 		}
+		if block == nil {
+			return nil, errBlockNotIndexed
+		}
 		blocks = append(blocks, block)
 	}
 	return blocks, nil

l2geth/rollup/rcfg/system_address.go

@@ -66,6 +66,12 @@ var SystemAddressDeployers = map[uint64]SystemAddressDeployer{
 		common.HexToAddress("0xc30276833798867c1dbc5c468bf51ca900b44e4c"),
 		common.HexToAddress("0x5c679a57e018f5f146838138d3e032ef4913d551"),
 	},
+
+	// Goerli nightly
+	421: {
+		common.HexToAddress("0xc30276833798867c1dbc5c468bf51ca900b44e4c"),
+		common.HexToAddress("0x5c679a57e018f5f146838138d3e032ef4913d551"),
+	},
 }
 
 var envSystemAddressDeployer SystemAddressDeployer

l2geth/rollup/rcfg/system_address_test.go

@@ -31,6 +31,11 @@ func TestSystemAddressFor(t *testing.T) {
 			common.HexToAddress("0x5c679a57e018f5f146838138d3e032ef4913d551"),
 			420,
 		},
+		{
+			common.HexToAddress("0xc30276833798867c1dbc5c468bf51ca900b44e4c"),
+			common.HexToAddress("0x5c679a57e018f5f146838138d3e032ef4913d551"),
+			421,
+		},
 	}
 	for _, tt := range tests {
 		chainID := big.NewInt(tt.chainId)

package.json

@@ -15,7 +15,6 @@
       "ops/docker/js-builder"
     ],
     "nohoist": [
-      "examples/*",
       "**/typechain",
       "**/@typechain/*"
     ]