Skip to content

Commit

Permalink
New release/v0.9.3 (#1291)
Browse files Browse the repository at this point in the history
* fix: Replace Teleportation rpcs with Tenderly rpcs (#1189)

(cherry picked from commit 0464581)

* making getBalance more robust (#1196)

(cherry picked from commit ad24168)

* Gateway : Cleanup Dead Code / Lazy loading of containers with  (#1212)

(cherry picked from commit 903cb8f)

* Fix/loading indicator dao proposals (#1218)

* added spinner with loading as fallback component to route

* fix: fetching proposal on dao page

(cherry picked from commit e9953b7)

* Feat/unsupported network modal (#1188)

* Show modal on unsuported networks changes

* update label

* usenetwork update

(cherry picked from commit 9b53adc)

* remplace seconds by days on earn calculation (#1221)

(cherry picked from commit 462866c)

* Feat/reinitialized network switcher (#1206)

* fixing bridge status

* fixing conflict

* reset connection after SwitchChain network

* wip updating fsbalances

* update network services

* removing debugging

* fixing issue on network switcher

* remove console logs

* remove console logs

(cherry picked from commit ee692cb)

* feat: Airdrop gas via Light Bridge (#1180)

* add weth on bsc

* use existing weth

* update-l2-weth

* gateway-correct-messaging

* fix error messages for bridge

* undo-old-code

* destchainid

* teleport

* teleportAsset works

* fixed-err

* cleanup

* monitor-watcher

* monitor-fix

* watcher

* type

* redeploy teleportation after audit on testnets

* Update 020-Teleportation.deploy.ts

* Update 020-Teleportation.deploy.ts

* teleportation service fixed

* error

* fix teleportation service

* Add contracts to register

* EIP1155 support

* fix-build

* teleportAsset fixed

* filters work

* rpc-fixed

* disburse

* checkpoint

* fe part done

* subgraph-teleportation

* graphql

* del

* teleportation integrated in Gateway

* rm teleportation from watcher/serverless

* fix approve for teleportation

* only-show-on-testnet

* fix-merge

* depcheck

* fix-tests

* fix depcheck & linter

* feat: Add info alert for teleportation bridge that unconventional wallets are not supported

* rm errors

* merge

* airdrop progress

* fix linting

* alt

* resolve depcheck

* implement airdrop gas on teleportation feedback

* feedback airdrop implemented: airdrop conditions for teleportation

* rm only

* remove usd/coingecko for teleportation

* integration tests

* rm minusdval

* depcheck fix

---------

Co-authored-by: cby3149 <[email protected]>
(cherry picked from commit ef44554)

* Gateway : Block Explorer links in footer. (#1222)

* fix: footer alignment as per design

* udated the designs and created new select component for dropdowns

* fix: menu dropdown style fixes

* fix: style fixes for select fixes

* fix: select option button

(cherry picked from commit 97c723e)

* cleanup infura and added tenderly rpc url (#1226)

(cherry picked from commit 08a84be)

* decouple gateway from rollup (#1245)

(cherry picked from commit d2683d6)

* Bump mikefarah/yq from 4.35.1 to 4.35.2 (#1249)

Bumps [mikefarah/yq](https://github.com/mikefarah/yq) from 4.35.1 to 4.35.2.
- [Release notes](https://github.com/mikefarah/yq/releases)
- [Changelog](https://github.com/mikefarah/yq/blob/master/release_notes.txt)
- [Commits](mikefarah/yq@v4.35.1...v4.35.2)

---
updated-dependencies:
- dependency-name: mikefarah/yq
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
(cherry picked from commit d7753fa)

* Inomurko/update packages (#1248)

* v1.0.3

* use bobanetwork packages where applicable

* revert yarn.lock

* more deps bumps

* teleportation bump

* more deps bumps

* monitor deps bump

* does yarn install help?

* bobalink gaspriceoracle deps

* rem ethereumjs-evm

* rem ethersproject/rlp

* put deps back and print progress in plain

* put deps back and print progress in plain

* comment out avax builds and add deps

* disable BUILDKIT for reliablity

* disable BUILDKIT for reliablity

* is buildx more reliable

* is buildx more reliable - load to local registry

* bobalink deps

* bobalink deps in boba deployer

* change base image

* rem frozen lockfile

* yarn install again

* bump the machine executor

* docker-compose build

* restart always for deployer

* restart on failure, image downgrade, rem default platform

(cherry picked from commit a6f696f)

* feat: Add documentation for Teleportation contract parameters (#1211)

* feat: Add documentation for Teleportation contract parameters

* Add contract function to documentation

(cherry picked from commit 84c138b)

* Bump postcss from 8.4.21 to 8.4.31 (#1255)

(cherry picked from commit 5f6fc3b)

* Bump @types/chai-as-promised from 7.1.5 to 7.1.6 (#1257)

Bumps [@types/chai-as-promised](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/chai-as-promised) from 7.1.5 to 7.1.6.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/chai-as-promised)

---
updated-dependencies:
- dependency-name: "@types/chai-as-promised"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
(cherry picked from commit a3907da)

* Create SECURITY.md for Teleportation (#1253)

* Create SECURITY.md

* Update SECURITY.md

(cherry picked from commit 705b864)

* "updated web3 library using in fraud detector" (#1271)

(cherry picked from commit 81c5ca1)

* Turing replica state (#1286)

(cherry picked from commit 4dca96f)

* proxyd updates (#1285)

* proxyd updates

* fix proxyd testing in ci

---------

Co-authored-by: Boyuan-Chen <[email protected]>
(cherry picked from commit ad3dae7)

---------

Co-authored-by: Riedl Kevin, Bsc <[email protected]>
Co-authored-by: jemeza <[email protected]>
Co-authored-by: Sahil K <[email protected]>
Co-authored-by: alvaro-ricotta <[email protected]>
Co-authored-by: Ino Murko <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  • Loading branch information
7 people authored Nov 5, 2023
1 parent 54832bc commit 40f7625
Show file tree
Hide file tree
Showing 849 changed files with 20,382 additions and 80,283 deletions.
23 changes: 16 additions & 7 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -8,6 +13,7 @@ executors:
docker_layer_caching: true
environment:
DOCKER_BUILDKIT: 1
COMPOSE_DOCKER_CLI_BUILD: 1

commands:
check-changed:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/boba-publish-develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/boba-publish-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions boba_community/boba-relayer/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion boba_community/boba-relayer/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const {
CrossChainMessenger,
MessageStatus,
CONTRACT_ADDRESSES,
} = require('@eth-optimism/sdk')
} = require('@bobanetwork/sdk')

const main = async () => {
const env = process.env
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
14 changes: 7 additions & 7 deletions boba_community/fraud-detector/fraud-detector.py
Original file line number Diff line number Diff line change
Expand Up @@ -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...")
Expand All @@ -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...")
Expand All @@ -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...")
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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()
Expand Down
Original file line number Diff line number Diff line change
@@ -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'

Expand Down
2 changes: 1 addition & 1 deletion boba_community/hc-kyc/test/kyc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
Original file line number Diff line number Diff line change
@@ -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";

/**
Expand Down
2 changes: 1 addition & 1 deletion boba_community/hc-monsters/scripts/deploy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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'])
Expand Down
8 changes: 4 additions & 4 deletions boba_community/hc-monsters/test/NFTMonsterV2.ts
Original file line number Diff line number Diff line change
@@ -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

Expand Down
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
12 changes: 6 additions & 6 deletions boba_documentation/developer/price-feeds.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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
*/
Expand All @@ -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();
Expand All @@ -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

Expand Down
6 changes: 3 additions & 3 deletions boba_documentation/developer/xdomain-tx-status.md
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -117,4 +117,4 @@ The system is [documented here](../../ops_boba/api/watcher-api/README.md). For e
}
}
]
```
```
6 changes: 3 additions & 3 deletions boba_examples/nft_bridging/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
6 changes: 3 additions & 3 deletions boba_examples/nft_bridging/src/quickStart-goerli.js
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
2 changes: 1 addition & 1 deletion boba_examples/turing-complex-types/scripts/deploy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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'])
Expand Down
Loading

0 comments on commit 40f7625

Please sign in to comment.