Skip to content

Commit

Permalink
chore(deploy): cleanup docs deploy arbOne
Browse files Browse the repository at this point in the history
  • Loading branch information
bitbeckers committed Sep 29, 2024
1 parent 5893783 commit 3579544
Show file tree
Hide file tree
Showing 233 changed files with 9,284 additions and 26,501 deletions.
18 changes: 0 additions & 18 deletions .github/workflows/ci-default.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,8 @@
# NOTE: This name appears in GitHub's Checks API and in workflow's status badge.
name: ci-default
env:
TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
NEXT_PUBLIC_DOMAIN: ${{ vars.NEXT_PUBLIC_DOMAIN }}
NEXT_PUBLIC_DEFAULT_CHAIN_ID: ${{ vars.NEXT_PUBLIC_DEFAULT_CHAIN_ID }}
NEXT_PUBLIC_CONTRACT_ADDRESS: ${{ vars.NEXT_PUBLIC_CONTRACT_ADDRESS }}
NEXT_PUBLIC_GRAPH_URL: ${{ vars.NEXT_PUBLIC_GRAPH_URL }}
NEXT_PUBLIC_NFT_STORAGE_TOKEN: ${{ secrets.NEXT_PUBLIC_NFT_STORAGE_TOKEN }}
NEXT_PUBLIC_WEB3_STORAGE_TOKEN: ${{ secrets.NEXT_PUBLIC_NFT_STORAGE_TOKEN }}
NEXT_PUBLIC_SUPABASE_URL: ${{ vars.NEXT_PUBLIC_SUPABASE_URL }}
NEXT_PUBLIC_SUPABASE_ANON_KEY: ${{ secrets.NEXT_PUBLIC_SUPABASE_ANON_KEY }}
NEXT_PUBLIC_SUPABASE_TABLE: ${{ vars.NEXT_PUBLIC_SUPABASE_TABLE }}
NEXT_PUBLIC_WALLETCONNECT_ID: ${{ secrets.NEXT_PUBLIC_WALLETCONNECT_ID }}
INFURA_API_KEY: ${{ secrets.INFURA_API_KEY }}
ALCHEMY_API_KEY: ${{ secrets.ALCHEMY_API_KEY }}
DOCKER_PLATFORM: "amd64"

# Trigger the workflow when:
on:
Expand Down Expand Up @@ -46,14 +33,9 @@ jobs:
# Fetch all history so gitlint can check the relevant commits.
fetch-depth: "0"
- run: corepack enable
- name: Set up Python 3
uses: actions/setup-python@v4
with:
python-version: "3.x"
- name: Set up Node.js 18
uses: actions/setup-node@v4
with:
node-version: "18.18.1"
cache: "pnpm"

- name: Install Foundry
Expand Down
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +0,0 @@
[submodule "sdk/lib/hypercerts-api"]
path = sdk/lib/hypercerts-api
url = https://github.com/hypercerts-org/hypercerts-api
8 changes: 4 additions & 4 deletions contracts/hardhat.config.cts
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ function getChainConfig(chain: keyof typeof chainIds) {
config = {
...config,
url: `https://arb-mainnet.g.alchemy.com/v2/${ALCHEMY_API_KEY}`,
// url: "https://virtual.arbitrum.rpc.tenderly.co/982c9fbc-4ae9-4eb6-9346-daca23fd603f",
// url: "https://virtual.arbitrum.rpc.tenderly.co/143c1212-e69c-4f74-bd24-8676c965c44c",
};
}

Expand Down Expand Up @@ -154,7 +154,7 @@ const config: HardhatUserConfig = {
except: ["@openzeppelin"],
},
dodoc: {
runOnCompile: true,
runOnCompile: false,
include: ["src/marketplace", "src/protocol"],
freshOutput: true,
outputDir: "../docs/docs/developer/api/contracts",
Expand All @@ -167,7 +167,7 @@ const config: HardhatUserConfig = {
base: BASESCAN_API_KEY!,
"base-sepolia": BASESCAN_API_KEY!,
"arb-sepolia": ARBISCAN_API_KEY!,
arbitrumOne: ARBISCAN_API_KEY!,
arbitrumOne: "DPB1JAY49URG4RJP76WQ11CMGPBF2FX3C5",
},
customChains: [
{
Expand Down Expand Up @@ -221,7 +221,7 @@ const config: HardhatUserConfig = {
"base-sepolia": getChainConfig("base-sepolia"),
"base-mainnet": getChainConfig("base-mainnet"),
"arb-sepolia": getChainConfig("arb-sepolia"),
"arbitrumOne": getChainConfig("arbitrumOne"),
arbitrumOne: getChainConfig("arbitrumOne"),
},
paths: {
cache: "./cache_hardhat", // Use a different cache for Hardhat than Foundry
Expand Down
2 changes: 1 addition & 1 deletion contracts/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@hypercerts-org/contracts",
"description": "EVM compatible protocol for managing impact claims",
"version": "2.0.0-alpha.8",
"version": "2.0.0-alpha.9",
"author": {
"name": "Hypercerts Foundation",
"url": "https://github.com/hypercerts-org/hypercerts"
Expand Down
9,209 changes: 9,209 additions & 0 deletions contracts/pnpm-lock.yaml

Large diffs are not rendered by default.

55 changes: 55 additions & 0 deletions contracts/src/deployments/deployment-marketplace-arbitrumOne.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
{
"TransferManager": {
"address": "0x658c1695DCb298E57e6144F6dA3e83DdCF5e2BaB",
"fullNamespace": "TransferManager",
"args": ["0xdc6d6f9ab5fcc398b92b017e8482749ae5afbf35"],
"encodedArgs": "0xdc6d6f9ab5fcc398b92b017e8482749ae5afbf35",
"tx": "0x70b306371278c66189814b465e151006ad6a6e0c9d6b910c0234ac2ec8da1706"
},
"ProtocolFeeRecipient": {
"address": "0xE332d4b0a30a522099292594999967267480a081",
"fullNamespace": "ProtocolFeeRecipient",
"args": ["0xE7C4531ad8828794904D332a12702beC8ff1A498", "0x82aF49447D8a07e3bd95BD0d56f35241523fBab1"],
"encodedArgs": "0xe7c4531ad8828794904d332a12702bec8ff1a49882af49447d8a07e3bd95bd0d56f35241523fbab1",
"tx": "0x6d9ff2423d04879b3445bb95c2abdfe760090391440e1e2ea92e26c267d5c696"
},
"HypercertExchange": {
"address": "0xcE8fa09562f07c23B9C21b5d0A29a293F8a8BC83",
"fullNamespace": "LooksRareProtocol",
"args": [
"0xdc6d6f9ab5fcc398b92b017e8482749ae5afbf35",
"0xE332d4b0a30a522099292594999967267480a081",
"0x658c1695DCb298E57e6144F6dA3e83DdCF5e2BaB",
"0x82aF49447D8a07e3bd95BD0d56f35241523fBab1"
],
"encodedArgs": "0xdc6d6f9ab5fcc398b92b017e8482749ae5afbf35e332d4b0a30a522099292594999967267480a081658c1695dcb298e57e6144f6da3e83ddcf5e2bab82af49447d8a07e3bd95bd0d56f35241523fbab1",
"tx": "0x1eff2ebd3d6ad2a97f92c4caa648fb34fb25ca60730625d3491cd2b1171fcc23"
},
"RoyaltyFeeRegistry": {
"address": "0xd97b92B740EAf655DFf4f93B0D6D38232cfE84C6",
"fullNamespace": "RoyaltyFeeRegistry",
"args": ["1000"],
"encodedArgs": "0x00000000000000000000000000000000000000000000000000000000000003e8",
"tx": "0x8352d52116ff97551dca27801b0fe1995e9b66ad45062021c13da4d7855f9658"
},
"OrderValidator": {
"address": "0x74b05A917BBa5050ea216877c81801d6049b3f16",
"fullNamespace": "OrderValidatorV2A",
"args": ["0xcE8fa09562f07c23B9C21b5d0A29a293F8a8BC83"],
"encodedArgs": "0xce8fa09562f07c23b9c21b5d0a29a293f8a8bc83"
},
"CreatorFeeManager": {
"address": "0x2d25df25ab95b74a18eb2d719a98b47f5e5f5534",
"fullNamespace": "CreatorFeeManagerWithRoyalties",
"args": ["0xd97b92B740EAf655DFf4f93B0D6D38232cfE84C6"],
"encodedArgs": "0xd97b92b740eaf655dff4f93b0d6d38232cfe84c6",
"tx": "0x2339dcf7dda93e4fbfc763a70dfe932b793552ee805c584d10acdf6127ba18f2"
},
"StrategyHypercertFractionOffer": {
"address": "0xecab24cade0261fc6513ca13bb3d10f760af3da8",
"fullNamespace": "StrategyHypercertFractionOffer",
"args": [],
"encodedArgs": "0x",
"tx": "0x79012a15888ec5c77e7c68cbc85614645f13603e18a1f951746fa5857c0f0a23"
}
}
8 changes: 8 additions & 0 deletions contracts/src/deployments/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import deployments_marketplace_optimism_mainnet from "./deployment-marketplace-o
import deployments_marketplace_sepolia from "./deployment-marketplace-sepolia.json";
import deployments_protocol from "./deployments-protocol.json";
import deployments_marketplace_arb_sepolia from "./deployment-marketplace-arb-sepolia.json";
import deployments_marketplace_arb_one from "./deployment-marketplace-arbitrumOne.json";

const deployments_marketplace = {
"10": {
Expand Down Expand Up @@ -33,6 +34,13 @@ const deployments_marketplace = {
RoyaltyFeeRegistry: deployments_marketplace_arb_sepolia.RoyaltyFeeRegistry.address,
StrategyHypercertFractionOffer: deployments_marketplace_arb_sepolia.StrategyHypercertFractionOffer.address,
},
"42161": {
TransferManager: deployments_marketplace_arb_one.TransferManager.address,
HypercertExchange: deployments_marketplace_arb_one.HypercertExchange.address,
OrderValidatorV2A: deployments_marketplace_arb_one.OrderValidator.address,
RoyaltyFeeRegistry: deployments_marketplace_arb_one.RoyaltyFeeRegistry.address,
StrategyHypercertFractionOffer: deployments_marketplace_arb_one.StrategyHypercertFractionOffer.address,
},
};

export default { marketplace: deployments_marketplace, protocol: deployments_protocol };
1 change: 1 addition & 0 deletions contracts/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ const deployments = {
},
42161: {
...DEPLOYMENTS.protocol["42161"],
...DEPLOYMENTS.marketplace["42161"],
},
421614: {
...DEPLOYMENTS.protocol["421614"],
Expand Down
7 changes: 5 additions & 2 deletions contracts/tasks/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ const WETH: TokenAddressType = {
"optimism-mainnet": "0x4200000000000000000000000000000000000006",
"base-sepolia": "0x4200000000000000000000000000000000000006",
"arb-sepolia": "0x3031a6D5D9648BA5f50f656Cd4a1672E1167a34A",
arbitrumOne: "0x82aF49447D8a07e3bd95BD0d56f35241523fBab1",
};

// LINK faucet for Sepolia: https://faucets.chain.link/
Expand All @@ -17,6 +18,7 @@ const DAI: TokenAddressType = {
"optimism-mainnet": "0xda10009cbd5d07dd0cecc66161fc93d7c9000da1",
"base-sepolia": "0xE4aB69C077896252FAFBD49EFD26B5D171A32410",
"arb-sepolia": "0xb1D4538B4571d411F07960EF2838Ce337FE1E80E",
arbitrumOne: "0xDA10009cBd5D07dd0CeCc66161FC93D7c9000da1",
};

// USDC https://faucet.circle.com/
Expand All @@ -28,6 +30,7 @@ const USDC: TokenAddressType = {
"optimism-mainnet": "0x0b2C639c533813f4Aa9D7837CAf62653d097Ff85",
"base-sepolia": "0x036CbD53842c5426634e7929541eC2318f3dCF7e",
"arb-sepolia": "0x75faf114eafb1BDbe2F0316DF893fd58CE46AA4d",
arbitrumOne: "0xaf88d065e77c8cC2239327C5EDb3A432268e5831",
};

export const getTokenAddresses = (network: string) => {
Expand All @@ -46,7 +49,7 @@ const ADMIN_ACCOUNT: { [key: string]: string } = {
"optimism-mainnet": "0x560adA72a80b4707e493cA8c3B7B7528930E7Be5",
celo: "0x14ae502FEF3843fF3a1735B3209D39B320130af9",
base: "0x14ae502FEF3843fF3a1735B3209D39B320130af9",
arbitrum: "0x14ae502FEF3843fF3a1735B3209D39B320130af9",
arbitrumOne: "0x14ae502FEF3843fF3a1735B3209D39B320130af9",
"arb-sepolia": "0x5d36971451AE593685Cab8815d644f9B4B66Ec99",
};

Expand All @@ -68,7 +71,7 @@ const FEE_RECIPIENT: { [key: string]: string } = {
"optimism-mainnet": "0xE7C4531ad8828794904D332a12702beC8ff1A498",
celo: "0xE7C4531ad8828794904D332a12702beC8ff1A498",
base: "0xE7C4531ad8828794904D332a12702beC8ff1A498",
arbitrum: "0xE7C4531ad8828794904D332a12702beC8ff1A498",
arbitrumOne: "0xE7C4531ad8828794904D332a12702beC8ff1A498",
"arb-sepolia": "0x5d36971451AE593685Cab8815d644f9B4B66Ec99",
};

Expand Down
2 changes: 1 addition & 1 deletion contracts/tasks/deploy-marketplace.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ const runCreate2Deployment = async (
abi: create2Instance.abi,
functionName: "safeCreate2",
args: [create2.salt, create2.deployData],
account: "0x5d36971451ae593685cab8815d644f9b4b66ec99", // update method to take account as arg
account: "0xDc6d6f9aB5fcc398B92B017e8482749aE5afbF35", // update method to take account as arg
});

const hash = await create2Instance.write.safeCreate2([create2.salt, create2.deployData]);
Expand Down
27 changes: 0 additions & 27 deletions docs/.eslintrc.yml

This file was deleted.

22 changes: 0 additions & 22 deletions docs/.gitignore

This file was deleted.

40 changes: 0 additions & 40 deletions docs/README.md

This file was deleted.

3 changes: 0 additions & 3 deletions docs/babel.config.ts

This file was deleted.

22 changes: 0 additions & 22 deletions docs/docs/about.md

This file was deleted.

24 changes: 0 additions & 24 deletions docs/docs/announcements/2024_01_16_An_Impactful_Year.md

This file was deleted.

Loading

0 comments on commit 3579544

Please sign in to comment.