Skip to content

Commit

Permalink
Merge pull request #3445 from synapsecns/master
Browse files Browse the repository at this point in the history
fe-release 12/8
  • Loading branch information
abtestingalpha authored Dec 9, 2024
2 parents acdd8d9 + bf6b5bf commit 90de2bd
Show file tree
Hide file tree
Showing 35 changed files with 142 additions and 29 deletions.
5 changes: 4 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,14 @@
# ignore ifacemaker files
*_generated.go linguist-generated
contrib/opbot/generated/* linguist-generated
*.contractinfo.json linguist-generated=true
*.contractinfo.json linguist-generated


# svg should be treated as a binary https://git.io/JE2VK
*.svg binary
*.sol linguist-language=Solidity

.vscode/*.json linguist-language=jsonc

# foundry deploy data
packages/**/deployments/*.json linguist-generated
24 changes: 24 additions & 0 deletions docs/bridge/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,30 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [0.5.13](https://github.com/synapsecns/sanguine/compare/@synapsecns/[email protected]...@synapsecns/[email protected]) (2024-12-08)

**Note:** Version bump only for package @synapsecns/bridge-docs





## [0.5.12](https://github.com/synapsecns/sanguine/compare/@synapsecns/[email protected]...@synapsecns/[email protected]) (2024-12-06)

**Note:** Version bump only for package @synapsecns/bridge-docs





## [0.5.11](https://github.com/synapsecns/sanguine/compare/@synapsecns/[email protected]...@synapsecns/[email protected]) (2024-12-02)

**Note:** Version bump only for package @synapsecns/bridge-docs





## [0.5.10](https://github.com/synapsecns/sanguine/compare/@synapsecns/[email protected]...@synapsecns/[email protected]) (2024-12-02)

**Note:** Version bump only for package @synapsecns/bridge-docs
Expand Down
24 changes: 24 additions & 0 deletions docs/bridge/docs/01-About/04-SYN.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
---
title: $SYN Token
---

# $SYN Token

$SYN is the governance token for the Synapse Protocol. There are no unlocks, all future $SYN emissions are goverened by the [DAO](/docs/About/DAO).

Liquidity for the [$SYN](https://coinmarketcap.com/currencies/synapse-2/) token can be found here:

| Venue | Link |
| -------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| Coinbase | `https://www.coinbase.com/price/synapse` [](https://www.coinbase.com/price/synapse) |
| Sushi | `https://www.sushi.com/ethereum/pool/v2/0x4a86c01d67965f8cb3d0aaa2c655705e64097c31` [](https://www.sushi.com/ethereum/pool/v2/0x4a86c01d67965f8cb3d0aaa2c655705e64097c31) |
| Revolut | `https://www.revolut.com/crypto/price/syn` [](https://www.revolut.com/crypto/price/syn) |
| Binance (Spot) | `https://www.binance.com/en/trade/SYN_USDT?type=spot` [](https://www.binance.com/en/trade/SYN_USDT?type=spot) |
| Binance (Perpetuals) | `https://www.binance.com/en/futures/SYNUSDT` [](https://www.binance.com/en/futures/SYNUSDT) |
| Bybit (SYN/USDT) | `https://www.bybit.com/trade/usdt/SYNUSDT` [](https://www.bybit.com/trade/usdt/SYNUSDT) |
| HTX | `https://www.htx.com/price/syn/` [](https://www.htx.com/price/syn/) |
| Kraken | `https://www.kraken.com/prices/synapse` [](https://www.kraken.com/prices/synapse) |
| KuCoin | `https://www.kucoin.com/price/SYN` [](https://www.kucoin.com/price/SYN) |
<br />

All $SYN token addresses can be found [here](/docs/Contracts/SYN).
2 changes: 1 addition & 1 deletion docs/bridge/docs/03-RFQ/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -206,5 +206,5 @@ If any discrepancies are found, the guards will [dispute] the proof
<blockquote>
Once the [Dispute Period] has passed without incident, a [claim] transaction can be executed by the [Relayer] on the origin chain.

This willrelease the deposit funds from escrow and deliver them to the rightful [Relayer] as a reimbursement for the liquidity they provided on the [relay].
This will release the deposit funds from escrow and deliver them to the rightful [Relayer] as a reimbursement for the liquidity they provided on the [relay].
</blockquote>
32 changes: 32 additions & 0 deletions docs/bridge/docs/05-Contracts/09-SYN.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
---
title: $SYN Token
---

:::note This list may be incomplete

The canonical list is hosted within the SynapseCNS on [Github](https://github.com/synapsecns/synapse-contracts).

:::

# $SYN

| Chain | Address |
| --------- | ---------------------------------------------------------------------------------------------------------------------------------------- |
| Arbitrum | `0x080f6aed32fc474dd5717105dba5ea57268f46eb` [](https://arbiscan.io/address/0x080f6aed32fc474dd5717105dba5ea57268f46eb) |
| Aurora | `0xd80d8688b02B3FD3afb81cDb124F188BB5aD0445` [](https://explorer.mainnet.aurora.dev/address/0xd80d8688b02B3FD3afb81cDb124F188BB5aD0445) |
| Avalanche | `0x1f1E7c893855525b303f99bDF5c3c05Be09ca251` [](https://snowscan.xyz/address/0x1f1E7c893855525b303f99bDF5c3c05Be09ca251) |
| Base | `0x432036208d2717394d2614d6697c46DF3Ed69540` [](https://basescan.org/address/0x432036208d2717394d2614d6697c46DF3Ed69540) |
| Blast | `0x9592f08387134e218327E6E8423400eb845EdE0E` [](https://blastscan.io/address/0x9592f08387134e218327E6E8423400eb845EdE0E) |
| Boba | `0xb554A55358fF0382Fb21F0a478C3546d1106Be8c` [](https://blockexplorer.boba.network/address/0xb554A55358fF0382Fb21F0a478C3546d1106Be8c) |
| BSC | `0xa4080f1778e69467e905b8d6f72f6e441f9e9484` [](https://bscscan.com/address/0xa4080f1778e69467e905b8d6f72f6e441f9e9484) |
| Canto | `0x555982d2E211745b96736665e19D9308B615F78e` [](https://canto.dex.guru/address/0x555982d2E211745b96736665e19D9308B615F78e) |
| Cronos | `0xFD0F80899983b8D46152aa1717D76cba71a31616` [](https://cronos.org/explorer/address/0xFD0F80899983b8D46152aa1717D76cba71a31616) |
| DFK Chain | `0xB6b5C854a8f71939556d4f3a2e5829F7FcC1bf2A` [](https://dfkchain.com/address/0xB6b5C854a8f71939556d4f3a2e5829F7FcC1bf2A) |
| Ethereum | `0x0f2D719407FdBeFF09D87557AbB7232601FD9F29` [](https://etherscan.io/address/0x0f2D719407FdBeFF09D87557AbB7232601FD9F29) |
| Fantom | `0xE55e19Fb4F2D85af758950957714292DAC1e25B2` [](https://ftmscan.com/address/0xE55e19Fb4F2D85af758950957714292DAC1e25B2) |
| Harmony | `0xE55e19Fb4F2D85af758950957714292DAC1e25B2` [](https://explorer.harmony.one/address/0xE55e19Fb4F2D85af758950957714292DAC1e25B2) |
| Metis | `0x67c10c397dd0ba417329543c1a40eb48aaa7cd00` [](https://andromeda-explorer.metis.io/address/0x67c10c397dd0ba417329543c1a40eb48aaa7cd00) |
| Moonbeam | `0xF44938b0125A6662f9536281aD2CD6c499F22004` [](https://moonbeam.moonscan.io/address/0xF44938b0125A6662f9536281aD2CD6c499F22004) |
| Moonriver | `0xd80d8688b02B3FD3afb81cDb124F188BB5aD0445` [](https://moonriver.moonscan.io/address/0xd80d8688b02B3FD3afb81cDb124F188BB5aD0445) |
| Optimism | `0x5A5fFf6F753d7C11A56A52FE47a177a87e431655` [](https://optimistic.etherscan.io/address/0x5A5fFf6F753d7C11A56A52FE47a177a87e431655) |
| Polygon | `0xf8f9efc0db77d8881500bb06ff5d6abc3070e695` [](https://polygonscan.com/address/0xf8f9efc0db77d8881500bb06ff5d6abc3070e695) |
2 changes: 1 addition & 1 deletion docs/bridge/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@synapsecns/bridge-docs",
"version": "0.5.10",
"version": "0.5.13",
"private": true,
"scripts": {
"docusaurus": "docusaurus",
Expand Down
2 changes: 1 addition & 1 deletion packages/contracts-rfq/.solhintignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ contracts/interfaces/IFastBridge.sol
contracts/legacy/**/*.sol
script/FastBridge.s.sol
test/FastBridge.t.sol
test/FastBridgeMock.sol
test/mocks/FastBridgeMock.sol
8 changes: 8 additions & 0 deletions packages/contracts-rfq/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [0.14.7](https://github.com/synapsecns/sanguine/compare/@synapsecns/[email protected]...@synapsecns/[email protected]) (2024-12-05)

**Note:** Version bump only for package @synapsecns/contracts-rfq





## [0.14.6](https://github.com/synapsecns/sanguine/compare/@synapsecns/[email protected]...@synapsecns/[email protected]) (2024-11-28)


Expand Down
4 changes: 2 additions & 2 deletions packages/contracts-rfq/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@synapsecns/contracts-rfq",
"license": "MIT",
"version": "0.14.6",
"version": "0.14.7",
"description": "FastBridge contracts.",
"private": true,
"files": [
Expand All @@ -26,7 +26,7 @@
"lint": "forge fmt && npm run solhint",
"lint:check": "forge fmt --check && npm run solhint:check",
"ci:lint": "npm run lint:check",
"build:go": "./flatten.sh contracts/*.sol test/*.sol",
"build:go": "./flatten.sh contracts/*.sol test/harnesses/*.sol test/mocks/*.sol",
"solhint": "solhint '{contracts,script,test}/**/*.sol' --fix --noPrompt --max-warnings 3",
"solhint:check": "solhint '{contracts,script,test}/**/*.sol' --max-warnings 3"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/contracts-rfq/test/FastBridge.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import "../contracts/interfaces/IFastBridge.sol";
import "../contracts/libs/Errors.sol";
import "../contracts/libs/UniversalToken.sol";

import "./MockERC20.sol";
import "./mocks/MockERC20.sol";

import {IAccessControl} from "@openzeppelin/contracts/access/IAccessControl.sol";

Expand Down
2 changes: 1 addition & 1 deletion packages/contracts-rfq/test/FastBridgeV2.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {IFastBridgeV2} from "../contracts/interfaces/IFastBridgeV2.sol";
import {FastBridgeV2} from "../contracts/FastBridgeV2.sol";
import {IFastBridgeV2Errors} from "../contracts/interfaces/IFastBridgeV2Errors.sol";

import {MockERC20} from "./MockERC20.sol";
import {MockERC20} from "./mocks/MockERC20.sol";

import {IAccessControl} from "@openzeppelin/contracts/access/IAccessControl.sol";
import {Test} from "forge-std/Test.sol";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.17;

import {UniversalTokenLib} from "../contracts/libs/UniversalToken.sol";
import {UniversalTokenLib} from "../../contracts/libs/UniversalToken.sol";

// solhint-disable no-empty-blocks, ordering
contract UniversalTokenLibHarness {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {IFastBridgeV2} from "../../contracts/interfaces/IFastBridgeV2.sol";
import {IMulticallTarget} from "../../contracts/interfaces/IMulticallTarget.sol";
import {DisputePeriodNotPassed} from "../../contracts/libs/Errors.sol";

import {MockERC20} from "../MockERC20.sol";
import {MockERC20} from "../mocks/MockERC20.sol";

import {Test} from "forge-std/Test.sol";

Expand Down
2 changes: 1 addition & 1 deletion packages/contracts-rfq/test/integration/TokenZapV1.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {BridgeTransactionV2Lib} from "../../contracts/libs/BridgeTransactionV2.s
import {ZapDataV1} from "../../contracts/libs/ZapDataV1.sol";
import {TokenZapV1} from "../../contracts/zaps/TokenZapV1.sol";

import {MockERC20} from "../MockERC20.sol";
import {MockERC20} from "../mocks/MockERC20.sol";
import {VaultManyArguments} from "../mocks/VaultManyArguments.sol";

import {Test} from "forge-std/Test.sol";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.17;

import {TokenNotContract} from "../contracts/libs/Errors.sol";
import {TokenNotContract} from "../../contracts/libs/Errors.sol";

import {MockERC20} from "./MockERC20.sol";
import {MockRevertingRecipient} from "./MockRevertingRecipient.sol";
import {UniversalTokenLibHarness} from "./UniversalTokenLibHarness.sol";
import {UniversalTokenLibHarness} from "../harnesses/UniversalTokenLibHarness.sol";
import {MockERC20} from "../mocks/MockERC20.sol";
import {MockRevertingRecipient} from "../mocks/MockRevertingRecipient.sol";

import {Test} from "forge-std/Test.sol";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.20;

import {Admin} from "../contracts/Admin.sol";
import {Admin} from "../../contracts/Admin.sol";

import {FastBridge} from "../contracts/FastBridge.sol";
import {IFastBridge} from "../contracts/interfaces/IFastBridge.sol";
import {FastBridge} from "../../contracts/FastBridge.sol";
import {IFastBridge} from "../../contracts/interfaces/IFastBridge.sol";

contract FastBridgeMock is IFastBridge, Admin {
// @dev the block the contract was deployed at
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion packages/contracts-rfq/test/zaps/TokenZapV1.GasBench.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ pragma solidity 0.8.24;

import {TokenZapV1} from "../../contracts/zaps/TokenZapV1.sol";

import {MockERC20} from "../MockERC20.sol";
import {MockERC20} from "../mocks/MockERC20.sol";
import {SimpleVaultMock} from "../mocks/SimpleVaultMock.sol";

import {Test} from "forge-std/Test.sol";
Expand Down
2 changes: 1 addition & 1 deletion packages/contracts-rfq/test/zaps/TokenZapV1.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ pragma solidity 0.8.24;
import {ZapDataV1} from "../../contracts/libs/ZapDataV1.sol";
import {TokenZapV1} from "../../contracts/zaps/TokenZapV1.sol";

import {MockERC20} from "../MockERC20.sol";
import {MockERC20} from "../mocks/MockERC20.sol";
import {NonPayableRecipient} from "../mocks/NonPayableRecipient.sol";
import {RecipientMock} from "../mocks/RecipientMock.sol";
import {VaultManyArguments} from "../mocks/VaultManyArguments.sol";
Expand Down
8 changes: 8 additions & 0 deletions packages/synapse-interface/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [0.40.23](https://github.com/synapsecns/sanguine/compare/@synapsecns/[email protected]...@synapsecns/[email protected]) (2024-12-06)

**Note:** Version bump only for package @synapsecns/synapse-interface





## [0.40.22](https://github.com/synapsecns/sanguine/compare/@synapsecns/[email protected]...@synapsecns/[email protected]) (2024-12-02)


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -211,9 +211,9 @@ function MoreInfoButtons() {
description="See preliminary analytics of the bridge"
/>
<MoreInfoItem
to={NAVIGATION.Contracts.path}
labelText={NAVIGATION.Contracts.text}
description="View contract related information such as contract addresses"
to={NAVIGATION.SYN.path}
labelText={NAVIGATION.SYN.text}
description="View $SYN related information such as contract addresses"
/>
</>
)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import React from 'react'
import toast from 'react-hot-toast'
import {
XIcon,
Expand Down
6 changes: 5 additions & 1 deletion packages/synapse-interface/components/toast/index.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
// @ts-nocheck
import React from 'react'
import toast, { Toaster, ToastBar } from 'react-hot-toast'
import ToastContent from './ToastContent'

export default function CustomToaster() {
const CustomToaster: React.FC = () => {
return (
<Toaster
position="bottom-right" // top-right
Expand All @@ -28,3 +30,5 @@ export default function CustomToaster() {
</Toaster>
)
}

export default CustomToaster
8 changes: 4 additions & 4 deletions packages/synapse-interface/constants/routes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import {
POOL_PATH,
LANDING_PATH,
BRIDGE_PATH,
INTERCHAIN_LINK,
SOLANA_BRIDGE_LINK,
SYN_TOKEN_LINK,
} from './urls'

export interface RouteObject {
Expand Down Expand Up @@ -53,9 +53,9 @@ export const NAVIGATION: RouteObject = {
text: 'Explorer',
match: null,
},
Contracts: {
path: INTERCHAIN_LINK,
text: 'Interchain Network',
SYN: {
path: SYN_TOKEN_LINK,
text: '$SYN',
match: null,
},
Solana: {
Expand Down
1 change: 1 addition & 0 deletions packages/synapse-interface/constants/urls/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ export const LANDING_PATH = '/landing'
export const EXPLORER_KAPPA = 'https://explorer.synapseprotocol.com/tx/'
export const EXPLORER_PATH = 'https://explorer.synapseprotocol.com/'
export const INTERCHAIN_LINK = 'https://interchain.synapseprotocol.com/'
export const SYN_TOKEN_LINK = 'https://docs.synapseprotocol.com/docs/About/SYN'
export const SOLANA_BRIDGE_LINK = 'https://solana.synapseprotocol.com/'
export const TERMS_OF_SERVICE_PATH =
'https://explorer.synapseprotocol.com/terms'
Expand Down
1 change: 1 addition & 0 deletions packages/synapse-interface/messages/ar.json
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,7 @@
"Telegram": "تليجرام",
"Functions": "الوظائف",
"Developers": "المطورون",
"$SYN": "$SYN",
"Support": "الدعم"
},
"ReturnToMonke": {
Expand Down
1 change: 1 addition & 0 deletions packages/synapse-interface/messages/en-US.json
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,7 @@
"Telegram": "Telegram",
"Functions": "Functions",
"Developers": "Developers",
"$SYN": "$SYN",
"Support": "Support"
},
"ReturnToMonke": {
Expand Down
1 change: 1 addition & 0 deletions packages/synapse-interface/messages/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,7 @@
"Telegram": "Telegram",
"Functions": "Funciones",
"Developers": "Desarrolladores",
"$SYN": "$SYN",
"Support": "Soporte"
},
"ReturnToMonke": {
Expand Down
1 change: 1 addition & 0 deletions packages/synapse-interface/messages/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,7 @@
"Telegram": "Telegram",
"Functions": "Fonctions",
"Developers": "Développeurs",
"$SYN": "$SYN",
"Support": "Support"
},
"ReturnToMonke": {
Expand Down
1 change: 1 addition & 0 deletions packages/synapse-interface/messages/jp.json
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,7 @@
"Telegram": "Telegram",
"Functions": "機能",
"Developers": "開発者",
"$SYN": "$SYN",
"Support": "サポート"
},
"ReturnToMonke": {
Expand Down
1 change: 1 addition & 0 deletions packages/synapse-interface/messages/tr.json
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,7 @@
"Telegram": "Telegram",
"Functions": "Fonksiyonlar",
"Developers": "Geliştiriciler",
"$SYN": "$SYN",
"Support": "Destek"
},
"ReturnToMonke": {
Expand Down
1 change: 1 addition & 0 deletions packages/synapse-interface/messages/zh-CN.json
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,7 @@
"Telegram": "Telegram",
"Functions": "功能",
"Developers": "开发者",
"$SYN": "$SYN",
"Support": "支持"
},
"ReturnToMonke": {
Expand Down
2 changes: 1 addition & 1 deletion packages/synapse-interface/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@synapsecns/synapse-interface",
"version": "0.40.22",
"version": "0.40.23",
"private": true,
"engines": {
"node": ">=18.18.0"
Expand Down
Loading

0 comments on commit 90de2bd

Please sign in to comment.