feat: xDAI -> USDS migration 1st step, related to #161

.github/workflows/oicd-deploy.yml

@@ -15,12 +15,12 @@ on:
         description: 'subgraph dev tag version for gc subgraph'
         required: true
         type: string
-        default: v1.0.1-develop
+        default: version/latest
       dev_subgraph_mainnet:
         description: 'subgraph dev tag version for mainnet subgraph'
         required: true
         type: string
-        default: v1.0.0-develop
+        default: version/latest
 
 env:
   AWS_REGION: 'eu-central-1'

app/.gitignore

@@ -21,7 +21,6 @@
 *.pem
 tsconfig.tsbuildinfo
 .eslintcache
-types/generated/
 
 # debug
 npm-debug.log*
@@ -38,8 +37,9 @@ yarn-error.log*
 # vercel
 .vercel
 
-#types
-/types/typechain
-
 #IDE files
 /.idea
+
+
+# types/generated/
+# types/typechain/

app/Dockerfile

@@ -32,14 +32,12 @@ COPY /src ./src
 # Cleaning the cache of yarn
 RUN  yarn cache clean
 
-RUN  yarn install 
-RUN  yarn postinstall
+RUN  yarn install
 
 FROM base AS builder
 WORKDIR /app
 COPY --from=deps /app/node_modules ./node_modules
 COPY --from=deps /app/src ./src
-COPY --from=deps /app/types ./types
 COPY . .
 
 ENV NEXT_TELEMETRY_DISABLED 1

app/docker-compose.yaml

@@ -1,4 +1,3 @@
-version: '3.8'
 services:
   web:
     build:
@@ -8,6 +7,6 @@ services:
       - .:/app
     command: npm run dev
     ports:
-      - "3000:3000"
+      - '3000:3000'
     environment:
-      NODE_ENV: development
+      NODE_ENV: development

app/package.json

@@ -15,7 +15,7 @@
     "start": "next start",
     "typechain": "typechain --target=ethers-v5 ./src/abis/**/*.json --out-dir ./types/typechain/",
     "subgraph-codegen": "graphql-codegen --config ./subgraph-config.js",
-    "postinstall": "yarn typechain && yarn subgraph-codegen"
+    "postinstall-local": "yarn typechain && yarn subgraph-codegen"
   },
   "dependencies": {
     "@babel/traverse": "^7.23.2",

app/pages/api/tokens.ts

@@ -1,6 +1,6 @@
 import type { NextApiRequest, NextApiResponse } from 'next'
 
-import { NATIVE_TOKEN_ADDRESS } from '@/src/constants/config/common'
+import { NATIVE_TOKEN_ADDRESS, USDS_ADDRESS } from '@/src/constants/config/common'
 import { isSameString } from '@/src/utils/tools'
 import { Token as BaseToken } from '@/types/token'
 import bridgedTokens from '@/src/constants/bridged_tokens.json'
@@ -35,6 +35,7 @@ export default function handler(_: NextApiRequest, res: NextApiResponse<Array<To
     const { address, decimals, foreign_address, icon_url, name, origin_chain_id, symbol } = token
     const isWethOnXdai = isSameString(address, WETH_ON_XDAI)
     const isDaiOnMainnet = isSameString(foreign_address, DAI_ON_MAINNET)
+    const isUsdsOnMainnet = isSameString(foreign_address, USDS_ADDRESS)
     let extraTokens: Array<Token> = []
 
     if (isDaiOnMainnet) {
@@ -107,6 +108,41 @@ export default function handler(_: NextApiRequest, res: NextApiResponse<Array<To
       ]
     }
 
+    if (isUsdsOnMainnet) {
+      extraTokens = [
+        {
+          chainId: Number(origin_chain_id),
+          address: foreign_address,
+          decimals: Number(decimals),
+          logoURI: icon_url ?? undefined,
+          name: name.replace(bridgedTokenName, ''),
+          symbol,
+          extensions: {
+            bridgeInfo: {
+              100: {
+                tokenAddress: NATIVE_TOKEN_ADDRESS,
+              },
+            },
+          },
+        },
+        {
+          chainId: 100,
+          address: NATIVE_TOKEN_ADDRESS,
+          decimals: Number(decimals),
+          logoURI: icon_url ?? undefined,
+          name: 'xDai',
+          symbol: 'xDAI',
+          extensions: {
+            bridgeInfo: {
+              [origin_chain_id]: {
+                tokenAddress: foreign_address,
+              },
+            },
+          },
+        },
+      ]
+    }
+
     return [
       {
         chainId: Number(origin_chain_id),

app/src/abis/ForeignBridgeRouter.json

@@ -0,0 +1,170 @@
+[
+  { "inputs": [], "stateMutability": "nonpayable", "type": "constructor" },
+  { "inputs": [], "name": "ClaimUsdsNotSupported", "type": "error" },
+  { "inputs": [], "name": "InvalidInitialization", "type": "error" },
+  { "inputs": [], "name": "NotInitializing", "type": "error" },
+  {
+    "inputs": [{ "internalType": "address", "name": "owner", "type": "address" }],
+    "name": "OwnableInvalidOwner",
+    "type": "error"
+  },
+  {
+    "inputs": [{ "internalType": "address", "name": "account", "type": "address" }],
+    "name": "OwnableUnauthorizedAccount",
+    "type": "error"
+  },
+  {
+    "anonymous": false,
+    "inputs": [{ "indexed": false, "internalType": "uint64", "name": "version", "type": "uint64" }],
+    "name": "Initialized",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      { "indexed": true, "internalType": "address", "name": "previousOwner", "type": "address" },
+      { "indexed": true, "internalType": "address", "name": "newOwner", "type": "address" }
+    ],
+    "name": "OwnershipTransferred",
+    "type": "event"
+  },
+  {
+    "inputs": [],
+    "name": "DAI",
+    "outputs": [{ "internalType": "address", "name": "", "type": "address" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "FOREIGN_AMB",
+    "outputs": [{ "internalType": "address", "name": "", "type": "address" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "FOREIGN_OMNIBRIDGE",
+    "outputs": [{ "internalType": "address", "name": "", "type": "address" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "FOREIGN_XDAIBRIDGE",
+    "outputs": [{ "internalType": "address", "name": "", "type": "address" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "USDS",
+    "outputs": [{ "internalType": "address", "name": "", "type": "address" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "WETH_OMNIBRIDGE_ROUTER",
+    "outputs": [{ "internalType": "address", "name": "", "type": "address" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "bytes", "name": "message", "type": "bytes" },
+      { "internalType": "bytes", "name": "signatures", "type": "bytes" }
+    ],
+    "name": "executeSignatures",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "bytes", "name": "message", "type": "bytes" },
+      { "internalType": "bytes", "name": "signatures", "type": "bytes" }
+    ],
+    "name": "executeSignaturesUSDS",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [{ "internalType": "address", "name": "owner", "type": "address" }],
+    "name": "initialize",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "owner",
+    "outputs": [{ "internalType": "address", "name": "", "type": "address" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "address", "name": "token", "type": "address" },
+      { "internalType": "address", "name": "recipient", "type": "address" },
+      { "internalType": "uint256", "name": "amount", "type": "uint256" }
+    ],
+    "name": "recoverLockedFund",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "address", "name": "_token", "type": "address" },
+      { "internalType": "address", "name": "_receiver", "type": "address" },
+      { "internalType": "uint256", "name": "_amount", "type": "uint256" }
+    ],
+    "name": "relayTokens",
+    "outputs": [],
+    "stateMutability": "payable",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "renounceOwnership",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "bytes", "name": "message", "type": "bytes" },
+      { "internalType": "bytes", "name": "signatures", "type": "bytes" }
+    ],
+    "name": "safeExecuteSignaturesWithAutoGasLimit",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "address", "name": "_token", "type": "address" },
+      { "internalType": "address", "name": "_route", "type": "address" }
+    ],
+    "name": "setRoute",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [{ "internalType": "address", "name": "", "type": "address" }],
+    "name": "tokenRoutes",
+    "outputs": [{ "internalType": "address", "name": "", "type": "address" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [{ "internalType": "address", "name": "newOwner", "type": "address" }],
+    "name": "transferOwnership",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  }
+]

app/src/constants/bridged_tokens.json

@@ -9762,6 +9762,22 @@
       "symbol": "UDT",
       "total_supply": "9936213363153110036806",
       "type": "ERC-20"
+    },
+    {
+      "bridge_type": "xdai",
+      "foreign_address": "0xdC035D45d973E3EC169d2276DDab16f1e407384F",
+      "origin_chain_id": "1",
+      "address": "",
+      "circulating_market_cap": null,
+      "decimals": "18",
+      "exchange_rate": null,
+      "holders": "2281",
+      "icon_url": null,
+      "is_bridged": true,
+      "name": "USDS",
+      "symbol": "USDS",
+      "total_supply": "3854025994000000000000000000",
+      "type": "ERC-20"
     }
   ]
 }

app/src/constants/config/chains.ts

@@ -24,6 +24,7 @@ export const chainsConfig: Record<ChainsValues, ChainConfig> = {
     bridge: {
       DAI: '0x6B175474E89094C44Da98b954EedeAC495271d0F',
       wForeignNative: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2', // WETH
+      USDS: '0xdc035d45d973e3ec169d2276ddab16f1e407384f',
     },
   },
   // [Chains.chiado]: {

app/src/constants/config/common.ts

@@ -11,3 +11,5 @@ export const WALLET_CONNECT_DAPP_URL = process.env.NEXT_PUBLIC_WALLET_CONNECT_DA
 export const WALLET_CONNECT_PROJECT_ID = process.env.NEXT_PUBLIC_WALLET_CONNECT_PROJECT_ID || ''
 
 export const NATIVE_TOKEN_ADDRESS = '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE'
+
+export const USDS_ADDRESS = '0xdC035D45d973E3EC169d2276DDab16f1e407384F'

app/src/constants/config/contracts.ts

@@ -67,6 +67,12 @@ export const contracts = {
     },
     abi: AMBBridgeHelper_abi,
   },
+  BridgeRouter: {
+    address: {
+      [Chains.mainnet]: '0x9a873656c19Efecbfb4f9FAb5B7acdeAb466a0B0',
+      [Chains.gnosis]: '',
+    },
+  },
 } as const
 
 export type ContractsKeys = keyof typeof contracts

app/src/constants/config/types.ts

@@ -21,6 +21,7 @@ export type ChainConfig = {
   bridge: {
     DAI: string
     wForeignNative: string
+    USDS?: string
   }
 }
 

app/src/constants/xdaiToken.ts

@@ -0,0 +1,18 @@
+import { Token } from '@/types/token'
+import { getIcon } from '@/src/utils/icons'
+import { NATIVE_TOKEN_ADDRESS, USDS_ADDRESS } from '@/src/constants/config/common'
+
+export const xdaiToken: Token = {
+  chainId: 100,
+  address: '0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee',
+  decimals: 18,
+  logoURI: getIcon('xdai'),
+  name: 'xDAI',
+  symbol: 'xDAI',
+  extensions: {
+    bridgeInfo: {
+      1: { tokenAddress: USDS_ADDRESS },
+      100: { tokenAddress: NATIVE_TOKEN_ADDRESS },
+    },
+  },
+}