Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[BUG] fixes an incorrect reference to the old create contract class for v2 #1655

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
e842984
Bump the all-actions group across 1 directory with 2 updates
dependabot[bot] Aug 25, 2024
0d11b12
Bump the minor-and-patch group across 1 directory with 4 updates
dependabot[bot] Aug 25, 2024
aef9dec
[FEATURE] SDS v2 (#1398)
aristidesstaffieri Aug 26, 2024
295ece3
Feature/safari support (#929)
aristidesstaffieri Aug 26, 2024
f2c2144
upgrade Freighter to node v21 (#1510)
piyalbasu Oct 8, 2024
630f514
Merge/catchup 5.25.0 (#1530)
piyalbasu Oct 24, 2024
68ebb83
Feature/fullscreen btn (#1580)
piyalbasu Oct 29, 2024
cab5b17
Merge remote-tracking branch 'origin' into release/5.25.0
aristidesstaffieri Oct 31, 2024
1fef11d
adjust button color and fix bad merge (#1616)
piyalbasu Nov 5, 2024
c21090c
enabled blockaid modal and SDS updates (#1617)
piyalbasu Nov 5, 2024
6db2f0d
start session properly after create/recover account (#1590)
piyalbasu Nov 6, 2024
d7b1531
use modern-compiler for sass-loader (#1625)
piyalbasu Nov 6, 2024
13d1541
QA for SDS beta 0 (#1624)
aristidesstaffieri Nov 7, 2024
c9ecff4
toggles the data loading flag off in the catch block of the transfer …
aristidesstaffieri Nov 11, 2024
67fa943
restore global inset padding, remove on specific views
aristidesstaffieri Nov 11, 2024
9201992
Bugfix/warning qa (#1639)
piyalbasu Nov 11, 2024
d9d5dfa
removes padding from tx detail and confirmation view insets
aristidesstaffieri Nov 11, 2024
f4b4a03
update tests; add snapshot for acct history (#1641)
piyalbasu Nov 11, 2024
b2696e1
Merge branch 'master' into release/5.25.0
piyalbasu Nov 11, 2024
0989119
Bugfix/recommended fee (#1642)
piyalbasu Nov 12, 2024
6656e82
Merge branch 'master' into release/5.25.0
piyalbasu Nov 12, 2024
6bd5a25
fixes an incorrect reference to the old create contract class for v2
aristidesstaffieri Nov 13, 2024
4a3dbe7
adds test for create contract v1 in sub invoke
aristidesstaffieri Nov 13, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: 2
updates:
- package-ecosystem: "npm"
directories:
directories:
- "/"
- "/@shared/api"
- "/@shared/helpers"
Expand All @@ -16,12 +16,12 @@ updates:
minor-and-patch:
applies-to: version-updates
update-types:
- "patch"
- "minor"
- "patch"
- "minor"
major:
applies-to: version-updates
update-types:
- "major"
- "major"
- package-ecosystem: "github-actions"
directory: "/"
schedule:
Expand All @@ -32,4 +32,4 @@ updates:
groups:
all-actions:
applies-to: version-updates
patterns: [ "*" ]
patterns: ["*"]
2 changes: 1 addition & 1 deletion .github/workflows/runSnapshots.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 18
node-version: 21
- name: Checkout code
uses: actions/checkout@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/runTests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 18
node-version: 21
- run: npm install -g yarn && yarn
- run: yarn setup
- run: yarn build:freighter-api
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/submitProduction.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
- name: Build extension
uses: actions/setup-node@v4
with:
node-version: "18"
node-version: "21"
- run: yarn setup && yarn build:freighter-api && yarn build:extension:production --env AMPLITUDE_KEY="${{ secrets.AMPLITUDE_KEY }}" SENTRY_KEY="${{ secrets.SENTRY_KEY }}"
- name: Install zip
uses: montudor/action-zip@0852c26906e00f8a315c704958823928d8018b28 #v1.0.0
Expand Down
81 changes: 81 additions & 0 deletions .github/workflows/submitSafari.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
name: Safari Deployment
on:
workflow_dispatch:
inputs:
version:
description: New Version
default: "1.0.0"
required: true
env:
GYM_PROJECT: "./extension/freighter-xcode"
jobs:
bump-version:
name: Bump Package Version and Submit Extension
runs-on: macos-latest
steps:
- uses: maxim-lobanov/setup-xcode@v1
- name: Checkout code
uses: actions/checkout@v2
- name: Update package.json version
uses: jossef/action-set-json-field@6e6d7e639f24b3955ef682815317b5613ac6ca12 #v1
with:
file: ./extension/package.json
field: version
value: ${{ github.event.inputs.version }}
- name: Update manifest-v2.json version_name
uses: jossef/action-set-json-field@6e6d7e639f24b3955ef682815317b5613ac6ca12 #v1
with:
file: ./extension/public/static/manifest/v2.json
field: version_name
value: ${{ github.event.inputs.version }}
- name: Update manifest-v3.json version_name
uses: jossef/action-set-json-field@6e6d7e639f24b3955ef682815317b5613ac6ca12 #v1
with:
file: ./extension/public/static/manifest/v3.json
field: version_name
value: ${{ github.event.inputs.version }}
- name: Get manifest.json version
id: manifest_version
uses: frabert/replace-string-action@4ec615c8a75164a61d8fb333ad5e2e86ff038af1 #v1.2
with:
string: ${{ github.event.inputs.version }}
pattern: \-(.*)
replace-with: ""
- name: Update manifest-v2.json version
uses: jossef/action-set-json-field@6e6d7e639f24b3955ef682815317b5613ac6ca12 #v1
with:
file: ./extension/public/static/manifest/v2.json
field: version
value: ${{ steps.manifest_version.outputs.replaced }}
- name: Update manifest-v3.json version
uses: jossef/action-set-json-field@6e6d7e639f24b3955ef682815317b5613ac6ca12 #v1
with:
file: ./extension/public/static/manifest/v3.json
field: version
value: ${{ steps.manifest_version.outputs.replaced }}
- name: Build extension
uses: actions/setup-node@v1
with:
node-version: "21"
- run: yarn setup && yarn build:freighter-api && yarn build:extension:production --env AMPLITUDE_KEY="${{ secrets.AMPLITUDE_KEY }}" SENTRY_KEY="${{ secrets.SENTRY_KEY }}"
- name: Convert extension to Xcode project
run: xcrun safari-web-extension-converter ./extension/build --project-location $GYM_PROJECT --macos-only
- name: Set up ruby env
uses: ruby/[email protected]
with:
ruby-version: 2.6.10
bundler-cache: true
- name: Bundle extension for Safari
run: bundle exec fastlane build
env:
GYM_PROJECT: $GYM_PROJECT
MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
APPLE_APP_ID: ${{ secrets.APPLE_APP_ID }}
APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
APPLE_USER_ID: ${{ secrets.APPLE_USER_ID }}
APPLE_KEY_ID: ${{ secrets.APPLE_KEY_ID }}
APPLE_ISSUER_ID: ${{ secrets.APPLE_ISSUER_ID }}
APPLE_B64_KEY: ${{ secrets.APPLE_B64_KEY }}
XCODE_PROJ_PATH: $GYM_PROJECT
- name: Upload archive to Apple Store
run: bundle exec fastlane upload
7 changes: 6 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,9 @@ node_modules

npm-debug.log*
yarn-debug.log*
yarn-error.log*
yarn-error.log*

# fastlane output
Freighter.app/
Freighter.pkg
Freighter.app.dSYM.zip
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v18
v21
11 changes: 8 additions & 3 deletions @shared/api/internal.ts
Original file line number Diff line number Diff line change
Expand Up @@ -79,20 +79,25 @@ export const GetTxStatus: {

export const createAccount = async (
password: string,
): Promise<{ publicKey: string; allAccounts: Array<Account> }> => {
): Promise<{
publicKey: string;
allAccounts: Array<Account>;
hasPrivateKey: boolean;
}> => {
let publicKey = "";
let allAccounts = [] as Array<Account>;
let hasPrivateKey = false;

try {
({ allAccounts, publicKey } = await sendMessageToBackground({
({ allAccounts, publicKey, hasPrivateKey } = await sendMessageToBackground({
password,
type: SERVICE_TYPES.CREATE_ACCOUNT,
}));
} catch (e) {
console.error(e);
}

return { allAccounts, publicKey };
return { allAccounts, publicKey, hasPrivateKey };
};

export const fundAccount = async (publicKey: string): Promise<void> => {
Expand Down
3 changes: 3 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source "https://rubygems.org"

gem "fastlane"
Loading