merge from upstream

open-dollar · Aug 1, 2023 · ae42a11 · ae42a11
2 parents 7bb3239 + fee956a
commit ae42a11
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 6 deletions.
diff --git a/.github/workflows/canary.yml → .github/workflows/github-canary.yml b/.github/workflows/canary.yml → .github/workflows/github-canary.yml
diff --git a/.github/workflows/npm-canary.yml b/.github/workflows/npm-canary.yml
@@ -0,0 +1,23 @@
+name: NPM Canary release
+
+on: workflow_dispatch
+
+jobs:
+  canary-publish:
+    name: Publish Packages (canary)
+    if: github.repository == 'hai-on-op/sdk'
+    runs-on: ubuntu-latest
+    environment: Canary
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 16
+          registry-url: 'https://registry.npmjs.org'
+      - run: yarn
+      - run: yarn build
+      - run: npm version prerelease --preid "${GITHUB_SHA::8}" --no-git-tag-version
+      - run: npm publish --access public --tag canary
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
diff --git a/src/contracts/addreses.ts b/src/contracts/addreses.ts
@@ -32,10 +32,8 @@ export type ContractKey =
     // | 'MEDIANIZER_OP'
     | 'PROXY_DEPLOYER'
     | 'GEB_RRFM_SETTER'
-    | 'GEB_RRFM_SETTER_RELAYER'
     | 'MEDIANIZER_RAI'
     | 'GEB_RRFM_CALCULATOR'
-    | 'GEB_DUMMY_RRFM_CALCULATOR'
     | 'SPOT_RAI'
     | 'PROXY_DEBT_AUCTION_ACTIONS'
     | 'PROXY_SURPLUS_AUCTION_ACTIONS'
@@ -70,9 +68,7 @@ const addresses: Record<GebDeployment, ContractList> = {
         GEB_GLOBAL_SETTLEMENT: '0xee4cf96e5359d9619197fd82b6ef2a9eae7b91e1',
         GEB_STABILITY_FEE_TREASURY: '0x83533fdd3285f48204215E9CF38C785371258E76',
         GEB_RRFM_CALCULATOR: '0x5CC4878eA3E6323FdA34b3D28551E1543DEe54C6',
-        GEB_DUMMY_RRFM_CALCULATOR: '0x9F02ddBFb4B045Df83D45c4d644027FBD7d72A6D',
         GEB_RRFM_SETTER: '0x7acfc14dbf2decd1c9213db32ae7784626daeb48',
-        GEB_RRFM_SETTER_RELAYER: '0xd52da90c20c4610fef8faade2a1281ffa54eb6fb',
         BASIC_ACTIONS: '0x174097a14a03Adb0039B0b7476E7fc2217d99579',
         PROXY_ACTIONS_GLOBAL_SETTLEMENT: '0x17b5d9914194a08c7Ef14451BA15E8aE4f92Cb93',
         PROXY_DEBT_AUCTION_ACTIONS: '0x943C6Bb9FD652f6e4a9dA32894075e5aBECAd394',
@@ -108,9 +104,7 @@ const addresses: Record<GebDeployment, ContractList> = {
         GEB_GLOBAL_SETTLEMENT: '0x1de67dA2aa6C3C0BEa350546f9BA4a8281b4CEAe',
         GEB_STABILITY_FEE_TREASURY: '0x37ee83E054D2f64efda73B48e360b30f8070858D',
         GEB_RRFM_CALCULATOR: '0x0000000000000000000000000000000000000114',
-        GEB_DUMMY_RRFM_CALCULATOR: '0x0000000000000000000000000000000000000115',
         GEB_RRFM_SETTER: '0x0000000000000000000000000000000000000116',
-        GEB_RRFM_SETTER_RELAYER: '0x0000000000000000000000000000000000000117',
         BASIC_ACTIONS: '0x48fC4859e06c1096b3A02d391F96376AdA9259a8',
         PROXY_ACTIONS_GLOBAL_SETTLEMENT: '0x0000000000000000000000000000000000000000',
         PROXY_DEBT_AUCTION_ACTIONS: '0x5fc994EBfAe4ABeFca0f2DeeFDC2C8A46AD2bEb0',