New release/v0.9.3

.circleci/config.yml

@@ -1,5 +1,10 @@
 version: 2.1
 
+parameters:
+  ci_builder_image:
+    type: string
+    default: us-docker.pkg.dev/${GCP_PROJECT_ID}/${GCP_ARTIFACT_REPOSITORY}/images/ci-builder:latest
+
 executors:
   intergration-tests-executor:
     resource_class: xlarge
@@ -8,6 +13,7 @@ executors:
       docker_layer_caching: true
     environment:
       DOCKER_BUILDKIT: 1
+      COMPOSE_DOCKER_CLI_BUILD: 1
 
 commands:
   check-changed:
@@ -71,12 +77,16 @@ commands:
           patterns: common-ts,contracts,core-utils,data-transport-layer,message-relayer,regenesis-surgery,sdk,integration-tests,l2geth,packages/boba/account-abstraction,packages/boba/bobalink,packages/boba/bundler,packages/boba/bundler_sdk,packages/boba/bundler_utils,packages/boba/contracts,packages/boba/gas-price-oracle,packages/boba/register,packages/boba/teleportation,ops,ops_boba
       - run:
           name: Build the project
-          command: yarn && yarn build
+          command: yarn && yarn install && yarn build
           working_directory: ./
 
       - run:
           name: Build the core services
-          command: docker-compose build
+          command: |
+            # docker context create buildx-build
+            # docker buildx create --use buildx-build
+            # docker buildx bake -f docker-compose.yml --load
+            docker-compose build
           working_directory: ops
 
       - run:
@@ -110,7 +120,7 @@ commands:
           name: Start background logging
           working_directory: ops
           background: true
-          command: docker-compose -f <<parameters.docker_compose_file>> -f <<parameters.docker_compose_side_file>> logs --follow
+          command: docker-compose -f <<parameters.docker_compose_file>> -f <<parameters.docker_compose_side_file>> logs --follow || true
       - run:
           name: Wait for sequencer
           command: bash scripts/wait-for-sequencer.sh
@@ -159,15 +169,14 @@ jobs:
         type: string
         default: this-package-does-not-exist
     docker:
-      - image: ethereumoptimism/ci-builder:latest
-      - image: cimg/postgres:14.1
+      - image: <<pipeline.parameters.ci_builder_image>>
     steps:
       - checkout
       - check-changed:
           patterns: go/proxyd
       - run:
           name: Lint
-          command: golangci-lint run -E goimports,sqlclosecheck,bodyclose,asciicheck,misspell,errorlint -e "errors.As" -e "errors.Is" ./...
+          command: make lint
           working_directory: <<parameters.working_directory>>
       - store_test_results:
           path: /test-results
@@ -223,7 +232,7 @@ workflows:
   main:
     jobs:
       - integration-tests
-      - integration-tests-avalanche
+      #- integration-tests-avalanche
       - integration-tests-bnb
       - go-lint-test-build:
           name: proxyd-tests

.github/workflows/boba-publish-develop.yml

@@ -72,7 +72,7 @@ jobs:
         with:
           node-version: 16
       - name: yq - portable yaml processor
-        uses: mikefarah/[email protected].1
+        uses: mikefarah/[email protected].2
 
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path

.github/workflows/boba-publish-master.yml

@@ -80,7 +80,7 @@ jobs:
         with:
           node-version: 16
       - name: yq - portable yaml processor
-        uses: mikefarah/[email protected].1
+        uses: mikefarah/[email protected].2
 
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path

boba_community/boba-relayer/package.json

@@ -1,13 +1,13 @@
 {
-  "name": "@boba/boba-relayer",
+  "name": "@bobanetwork/boba-relayer",
   "version": "1.0.0",
   "scripts": {
     "start": "node ./src/index.js",
     "postinstall": "patch-package"
   },
   "license": "MIT",
   "dependencies": {
-    "@eth-optimism/sdk": "1.0.1",
+    "@bobanetwork/sdk": "1.0.7",
     "dotenv": "^16.0.0",
     "ethers": "^5.5.4",
     "node-fetch": "2.6.0",

boba_community/boba-relayer/src/index.js

@@ -13,7 +13,7 @@ const {
   CrossChainMessenger,
   MessageStatus,
   CONTRACT_ADDRESSES,
-} = require('@eth-optimism/sdk')
+} = require('@bobanetwork/sdk')
 
 const main = async () => {
   const env = process.env

boba_community/fraud-detector/docker/Dockerfile.fraud-detector

@@ -1,5 +1,5 @@
 FROM python:3.8-slim
-RUN pip3 install --no-cache-dir web3==5.31.4
+RUN pip3 install --no-cache-dir web3==6.11.1
 COPY boba_community/fraud-detector/fraud-detector.py /
 COPY boba_community/fraud-detector/packages/jsonrpclib /jsonrpclib
 COPY /packages/contracts/artifacts/contracts/L1/rollup/StateCommitmentChain.sol/StateCommitmentChain.json /contracts/StateCommitmentChain.json

boba_community/fraud-detector/fraud-detector.py

@@ -87,7 +87,7 @@ def status(*args):
 while True:
   try:
     rpc[1] = Web3(Web3.HTTPProvider(os.environ['L1_NODE_WEB3_URL']))
-    assert (rpc[1].isConnected())
+    assert (rpc[1].is_connected())
     break
   except:
     logger.info ("Waiting for L1...")
@@ -99,7 +99,7 @@ def status(*args):
 while True:
   try:
     rpc[2] = Web3(Web3.HTTPProvider(os.environ['L2_NODE_WEB3_URL']))
-    assert (rpc[2].isConnected())
+    assert (rpc[2].is_connected())
     break
   except:
     logger.info ("Waiting for L2...")
@@ -111,7 +111,7 @@ def status(*args):
 while True:
   try:
     rpc[3] = Web3(Web3.HTTPProvider(os.environ['VERIFIER_WEB3_URL']))
-    assert (rpc[3].isConnected())
+    assert (rpc[3].is_connected())
     break
   except:
     logger.info ("Waiting for verifier...")
@@ -181,17 +181,17 @@ def doEvent(event, force_L2):
       match = "**** SCC/VERIFIER MISMATCH ****"
 
     if l2SR:
-      l2SR_str = Web3.toHex(l2SR)
+      l2SR_str = Web3.utils.toHex(l2SR)
     else:
       l2SR_str = "                                --                                "
-    log_str = "{} {} {} {} {} {}".format(rCount, event.blockNumber, Web3.toHex(sr), l2SR_str, Web3.toHex(vfSR), match)
+    log_str = "{} {} {} {} {} {}".format(rCount, event.blockNumber, Web3.utils.toHex(sr), l2SR_str, Web3.utils.toHex(vfSR), match)
     matchedLock.acquire()
     if match != "":
       Matched['is_ok'] = False
       logger.warning(log_str)
     else:
       Matched['Block'] = rCount
-      Matched['Root'] = Web3.toHex(sr)
+      Matched['Root'] = Web3.utils.toHex(sr)
       Matched['Time'] = time.time()
       logger.info(log_str)
     matchedLock.release()
@@ -238,7 +238,7 @@ def fpLoop():
 
   logger.info("#SCC-IDX L1-Block SCC-STATEROOT L2-STATEROOT VERIFIER-STATEROOT MISMATCH")
 
-  topic_sig = Web3.toHex(Web3.keccak(text="StateBatchAppended(uint256,bytes32,uint256,uint256,bytes)"))
+  topic_sig = Web3.utils.toHex(Web3.keccak(text="StateBatchAppended(uint256,bytes32,uint256,uint256,bytes)"))
 
   while startBlock < l1_tip:
     toBlock = min(startBlock+batch_size, l1_tip) - 1

boba_community/hc-captcha-faucet/packages/contracts/bin/deploy.ts

@@ -1,5 +1,5 @@
 import { Wallet, providers } from 'ethers'
-import { getContractFactory } from '@eth-optimism/contracts'
+import { getContractFactory } from '@bobanetwork/core_contracts'
 
 /* eslint-disable */
 require('dotenv').config()

boba_community/hc-captcha-faucet/packages/contracts/deploy/001-BobaFaucet.deploy.ts

@@ -1,4 +1,4 @@
-import { getContractFactory } from '@eth-optimism/contracts'
+import { getContractFactory } from '@bobanetwork/core_contracts'
 import { DeployFunction, DeploymentSubmission } from 'hardhat-deploy/dist/types'
 import { Contract, ContractFactory, utils } from 'ethers'
 

boba_community/hc-kyc/test/kyc.ts

@@ -8,7 +8,7 @@ import {
   Wallet,
   utils,
 } from 'ethers'
-import { getContractFactory } from '@eth-optimism/contracts'
+import { getContractFactory } from '@bobanetwork/core_contracts'
 import { ethers } from 'hardhat'
 import chai, { expect } from 'chai'
 import { solidity } from 'ethereum-waffle'

boba_community/hc-monsters/contracts/bridge/L1NFTMonsterV2.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity >0.7.5;
 
-import "@boba/contracts/contracts/standards/L1StandardERC721.sol";
+import "@bobanetwork/contracts/contracts/standards/L1StandardERC721.sol";
 import "base64-sol/base64.sol";
 
 /**

boba_community/hc-monsters/scripts/deploy.ts

@@ -3,7 +3,7 @@ import {Contract, ContractFactory, providers, utils, Wallet} from "ethers";
 import TuringHelperJson from "../artifacts/contracts/TuringHelper.sol/HybridComputeHelper.json";
 import {getContractFactory} from "@eth-optimism/contracts";
 const cfg = hre.network.config
-import L2GovernanceERC20Json from '@boba/contracts/artifacts/contracts/standards/L2GovernanceERC20.sol/L2GovernanceERC20.json'
+import L2GovernanceERC20Json from '@bobanetwork/contracts/artifacts/contracts/standards/L2GovernanceERC20.sol/L2GovernanceERC20.json'
 
 async function main() {
   const local_provider = new providers.JsonRpcProvider(cfg['url'])

boba_community/hc-monsters/test/NFTMonsterV2.ts

@@ -1,16 +1,16 @@
 import { Contract, ContractFactory, providers, Wallet, utils } from 'ethers'
-import { getContractFactory } from '@eth-optimism/contracts'
+import { getContractFactory } from '@bobanetwork/core_contracts'
 import { ethers } from 'hardhat'
 import chai, { expect } from 'chai'
 import { solidity } from 'ethereum-waffle'
 chai.use(solidity)
 import hre from 'hardhat'
-import L1StandardERC721Json from '@boba/contracts/artifacts/contracts/standards/L1StandardERC721.sol/L1StandardERC721.json'
+import L1StandardERC721Json from '@bobanetwork/contracts/artifacts/contracts/standards/L1StandardERC721.sol/L1StandardERC721.json'
 import ERC721Json from '../artifacts/contracts/NFTMonsterV2.sol/NFTMonsterV2.json'
 import L2BridgeMessengerMockJson from '../artifacts/contracts/L2BridgeMockMessenger.sol/L2BridgeMockMessenger.json'
 import TuringHelperJson from '../artifacts/contracts/TuringHelper.sol/TuringHelper.json'
-import L2GovernanceERC20Json from '@boba/contracts/artifacts/contracts/standards/L2GovernanceERC20.sol/L2GovernanceERC20.json'
-import L2NFTBridgeJson from '@boba/contracts/artifacts/contracts/ERC721Bridges/L2NFTBridge.sol/L2NFTBridge.json'
+import L2GovernanceERC20Json from '@bobanetwork/contracts/artifacts/contracts/standards/L2GovernanceERC20.sol/L2GovernanceERC20.json'
+import L2NFTBridgeJson from '@bobanetwork/contracts/artifacts/contracts/ERC721Bridges/L2NFTBridge.sol/L2NFTBridge.json'
 
 const cfg = hre.network.config
 

boba_community/hc-start/packages/dapp-contracts/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@boba/hcb-dapp-contracts",
+  "name": "@bobanetwork/hcb-dapp-contracts",
   "version": "0.1.0",
   "description": "Contracts for HybridCompute UX DApp",
   "main": "index.js",

boba_community/hc-start/packages/dapp-contracts/test/factory.ts

@@ -8,7 +8,7 @@ import {
   Wallet,
   utils,
 } from 'ethers'
-import { getContractFactory } from '@eth-optimism/contracts'
+import { getContractFactory } from '@bobanetwork/core_contracts'
 import { ethers, upgrades } from 'hardhat'
 import chai, { expect } from 'chai'
 import { solidity } from 'ethereum-waffle'

boba_documentation/developer/price-feeds.md

@@ -87,7 +87,7 @@ A quick note on fees and subscription: Currently the feed is free to use for the
 To get the latest price data call method **`latestRoundData(base, quote)`**. To get the price data from a certain past round (historical price) call method **`getRoundData(base, quote, roundId)`**. The `roundId` supplied here is phaseId plus aggregator roundId, for reference query the latest `roundId`. The answer returned will be of the form of decimals specified on the contract call method **`decimals(base, quote)`**. For example,
 
 ```javascript
-import "@boba/contracts/oracle/FeedRegistry.sol"
+import "@bobanetwork/contracts/oracle/FeedRegistry.sol"
 
 contract MyContract {
 
@@ -138,7 +138,7 @@ A complete list of publicly available Witnet data feeds on Boba can be found in
 Witnet price feeds can be integrated into your own Boba Mainnet contracts in two different ways:
 
 1. [Integrate through proxy](https://docs.witnet.io/smart-contracts/witnet-data-feeds/using-witnet-data-feeds#reading-multiple-currency-pairs-from-the-router) Recommended for testing and upgradability.
-   This is the preferred way to consume the Witnet-powered price feeds. Through using the ***Price Feeds Router***.  
+   This is the preferred way to consume the Witnet-powered price feeds. Through using the ***Price Feeds Router***.
 
 2. [Integrate directly](https://docs.witnet.io/smart-contracts/witnet-data-feeds/using-witnet-data-feeds#reading-last-price-and-timestamp-from-a-price-feed-contract-serving-a-specific-pair) Optimized for gas cost and decentralization
 
@@ -168,7 +168,7 @@ contract MyContract {
     IWitnetPriceRouter immutable public router;
 
     /**
-     * IMPORTANT: pass the WitnetPriceRouter address depending on 
+     * IMPORTANT: pass the WitnetPriceRouter address depending on
      * the network you are using! Please find available addresses here:
      * https://docs.witnet.io/smart-contracts/price-feeds/contract-addresses
      */
@@ -186,7 +186,7 @@ contract MyContract {
         (_price,,) = router.valueFor(bytes4(0x3d15f701));
     }
 
-    /// Returns the BTC / ETH price (6 decimals), derived from the ETH/USD and 
+    /// Returns the BTC / ETH price (6 decimals), derived from the ETH/USD and
     /// the BTC/USD pairs that were ultimately provided by the Witnet oracle.
     function getBtcEthPrice() public view returns (int256 _price) {
         return (1000000 * getBtcUsdPrice()) / getEthUsdPrice();
@@ -210,9 +210,9 @@ print("> lastTimestamp:", valueFor[1])
 print("> latestUpdateStatus:", valueFor[2])
 ```
 
-For more information about Witnet please refer to: 
+For more information about Witnet please refer to:
 
-[website](https://witnet.io/) | [docs](https://docs.witnet.io/) | [github](https://github.com/witnet) | [twitter](https://twitter.com/witnet_io) | [telegram](https://t.me/witnetio) | [discord](https://discord.gg/witnet) 
+[website](https://witnet.io/) | [docs](https://docs.witnet.io/) | [github](https://github.com/witnet) | [twitter](https://twitter.com/witnet_io) | [telegram](https://t.me/witnetio) | [discord](https://discord.gg/witnet)
 
 ## 3. Turing
 

boba_documentation/developer/xdomain-tx-status.md

@@ -24,7 +24,7 @@ Internally in all the services and also in the `gateway`, the status of transact
     CrossChainMessenger,
     MessageStatus,
     MessageDirection,
-  } from '@eth-optimism/sdk'
+  } from '@bobanetwork/sdk'
 
   const messenger = new CrossChainMessenger({
     l1SignerOrProvider: l1Wallet,
@@ -62,7 +62,7 @@ Internally in all the services and also in the `gateway`, the status of transact
 
 ## Using the Boba Transaction API
 
-The system is [documented here](../../ops_boba/api/watcher-api/README.md). For example, to get L2 transactions between two blocks, use `get.l2.transactions`: 
+The system is [documented here](../../ops_boba/api/watcher-api/README.md). For example, to get L2 transactions between two blocks, use `get.l2.transactions`:
 
 ### get.l2.transactions
 
@@ -117,4 +117,4 @@ The system is [documented here](../../ops_boba/api/watcher-api/README.md). For e
     }
   }
 ]
-```
+```

boba_examples/nft_bridging/src/index.js

@@ -5,9 +5,9 @@ const chalk = require('chalk')
 require('dotenv').config()
 
 const SampleERC721Json = require('../artifacts/contracts/SampleERC721.sol/SampleERC721.json')
-const L1StandardERC721Json = require('@boba/contracts/artifacts/contracts/standards/L1StandardERC721.sol/L1StandardERC721.json')
-const L1NFTBridgeJson = require('@boba/contracts/artifacts/contracts/ERC721Bridges/L1NFTBridge.sol/L1NFTBridge.json')
-const L2NFTBridgeJson = require('@boba/contracts/artifacts/contracts/ERC721Bridges/L2NFTBridge.sol/L2NFTBridge.json')
+const L1StandardERC721Json = require('@bobanetwork/contracts/artifacts/contracts/standards/L1StandardERC721.sol/L1StandardERC721.json')
+const L1NFTBridgeJson = require('@bobanetwork/contracts/artifacts/contracts/ERC721Bridges/L1NFTBridge.sol/L1NFTBridge.json')
+const L2NFTBridgeJson = require('@bobanetwork/contracts/artifacts/contracts/ERC721Bridges/L2NFTBridge.sol/L2NFTBridge.json')
 
 const { bridgeToL1 } = require('./bridgeToL1')
 const { bridgeBackToL2 } = require('./bridgeBackToL2')

boba_examples/nft_bridging/src/quickStart-goerli.js

@@ -5,9 +5,9 @@ const chalk = require('chalk')
 require('dotenv').config()
 
 const SampleERC721Json = require('../quickStart-Goerli/SampleERC721.json')
-const L1StandardERC721Json = require('@boba/contracts/artifacts/contracts/standards/L1StandardERC721.sol/L1StandardERC721.json')
-const L1NFTBridgeJson = require('@boba/contracts/artifacts/contracts/ERC721Bridges/L1NFTBridge.sol/L1NFTBridge.json')
-const L2NFTBridgeJson = require('@boba/contracts/artifacts/contracts/ERC721Bridges/L2NFTBridge.sol/L2NFTBridge.json')
+const L1StandardERC721Json = require('@bobanetwork/contracts/artifacts/contracts/standards/L1StandardERC721.sol/L1StandardERC721.json')
+const L1NFTBridgeJson = require('@bobanetwork/contracts/artifacts/contracts/ERC721Bridges/L1NFTBridge.sol/L1NFTBridge.json')
+const L2NFTBridgeJson = require('@bobanetwork/contracts/artifacts/contracts/ERC721Bridges/L2NFTBridge.sol/L2NFTBridge.json')
 
 const { bridgeToL1 } = require('./bridgeToL1')
 const { bridgeBackToL2 } = require('./bridgeBackToL2')

boba_examples/turing-complex-types/scripts/deploy.ts

@@ -3,7 +3,7 @@ import {Contract, ContractFactory, providers, utils, Wallet} from "ethers";
 import TuringHelperJson from "../artifacts/contracts/TuringHelper.sol/TuringHelper.json";
 import {getContractFactory} from "@eth-optimism/contracts";
 const cfg = hre.network.config
-import L2GovernanceERC20Json from '@boba/contracts/artifacts/contracts/standards/L2GovernanceERC20.sol/L2GovernanceERC20.json'
+import L2GovernanceERC20Json from '@bobanetwork/contracts/artifacts/contracts/standards/L2GovernanceERC20.sol/L2GovernanceERC20.json'
 
 async function main() {
   const local_provider = new providers.JsonRpcProvider(cfg['url'])