Skip to content

Commit

Permalink
Inomurko/update packages (#1248)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
InoMurko authored Oct 2, 2023
1 parent d7753fa commit a6f696f
Show file tree
Hide file tree
Showing 201 changed files with 12,830 additions and 25,928 deletions.
13 changes: 9 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ executors:
docker_layer_caching: true
environment:
DOCKER_BUILDKIT: 1
COMPOSE_DOCKER_CLI_BUILD: 1

commands:
check-changed:
Expand Down Expand Up @@ -71,12 +72,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 +115,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 @@ -223,7 +228,7 @@ workflows:
main:
jobs:
- integration-tests
- integration-tests-avalanche
#- integration-tests-avalanche
- integration-tests-bnb
- go-lint-test-build:
name: proxyd-tests
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 @@
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
2 changes: 1 addition & 1 deletion boba_examples/turing-hello-world/test/hello-world.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
Wallet,
utils,
} from 'ethers'
import { getContractFactory } from '@eth-optimism/contracts'
import { getContractFactory } from '@bobanetwork/core_contracts'
import chai, { expect } from 'chai'
import { solidity } from 'ethereum-waffle'
chai.use(solidity)
Expand Down
4 changes: 2 additions & 2 deletions boba_examples/turing-hello-world/test/local-webserver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const cfg = hre.network.config
const hPort = 1235 // Port for local HTTP server
var urlStr
var urlStr2
import { getContractFactory } from '@eth-optimism/contracts'
import { getContractFactory } from '@bobanetwork/core_contracts'
const gasOverride = {
gasLimit: 11000000 //3,000,000
}
Expand All @@ -21,7 +21,7 @@ import BobaTuringCreditJson from "../../../packages/contracts/artifacts/contract
import GasOracleJson from "../../../packages/contracts/artifacts/contracts/L2/predeploys/OVM_GasPriceOracle.sol/OVM_GasPriceOracle.json"
import HelloTuringJson from "../artifacts/contracts/HelloTuring.sol/HelloTuring.json"
import TuringHelper from "../artifacts/contracts/TuringHelper.sol/TuringHelper.json"
import L2GovernanceERC20Json from '@boba/contracts/artifacts/contracts/standards/L2GovernanceERC20.sol/L2GovernanceERC20.json'
import L2GovernanceERC20Json from '@bobanetwork/contracts/artifacts/contracts/standards/L2GovernanceERC20.sol/L2GovernanceERC20.json'
import { Server } from "http";

let Factory__Hello: ContractFactory
Expand Down
2 changes: 1 addition & 1 deletion boba_examples/turing-lending/test/lending.spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { BigNumber, 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'
Expand Down
2 changes: 1 addition & 1 deletion boba_examples/turing-nft-random/test/NFT_random.spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { BigNumber, 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'
Expand Down
2 changes: 1 addition & 1 deletion boba_examples/turing-stable-swap/test/stable_swap.spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { BigNumber, 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'
Expand Down
4 changes: 2 additions & 2 deletions integration-tests/contracts/MockGovernorBravoDelegate.sol
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
pragma solidity ^0.5.16;
pragma experimental ABIEncoderV2;

import "@boba/contracts/contracts/DAO/governance/GovernorBravoDelegate.sol";
import "@bobanetwork/contracts/contracts/DAO/governance/GovernorBravoDelegate.sol";

interface IMockGovernorBravoDelegate {

Expand Down Expand Up @@ -37,4 +37,4 @@ contract MockGovernorBravoDelegate is GovernorBravoDelegate {

emit VotingPeriodSet(oldVotingPeriod, votingPeriod);
}
}
}
4 changes: 2 additions & 2 deletions integration-tests/contracts/MockTimelock.sol
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//SPDX-License-Identifier: UNLICENSED
pragma solidity ^0.5.16;

import "@boba/contracts/contracts/DAO/governance/Timelock.sol";
import "@bobanetwork/contracts/contracts/DAO/governance/Timelock.sol";
import { IMockGovernorBravoDelegate } from "./MockGovernorBravoDelegate.sol";

contract MockTimelock is Timelock {
Expand All @@ -26,4 +26,4 @@ contract MockTimelock is Timelock {
require(msg.sender == owner);
IMockGovernorBravoDelegate(governor)._setVotingDelayMock(value);
}
}
}
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";

/**
* Sample L1 representation of TestExtraDataERC721
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/L2StandardERC721.sol";
import "@bobanetwork/contracts/contracts/standards/L2StandardERC721.sol";

/**
* Sample L2 representation of TestExtraDataERC721
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/L1StandardERC1155.sol";
import "@bobanetwork/contracts/contracts/standards/L1StandardERC1155.sol";

/**
* A Failing mint L1ERC1155 contract
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";

/**
* A Failing mint L1ERC721 contract
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/L2StandardERC1155.sol";
import "@bobanetwork/contracts/contracts/standards/L2StandardERC1155.sol";

/**
* A Failing mint L2ERC1155 contract
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/L2StandardERC721.sol";
import "@bobanetwork/contracts/contracts/standards/L2StandardERC721.sol";

/**
* A Failing mint L2ERC721 contract
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";

/**
* Sample L1 representation of TestUniqueDataERC721
Expand Down
Loading

0 comments on commit a6f696f

Please sign in to comment.