diff --git a/.github/workflows/tinlake-ui-deploy-to-dev.yml b/.github/workflows/tinlake-ui-deploy-to-dev.yml index aaa78ff1..4c376635 100644 --- a/.github/workflows/tinlake-ui-deploy-to-dev.yml +++ b/.github/workflows/tinlake-ui-deploy-to-dev.yml @@ -140,7 +140,7 @@ jobs: NEXT_PUBLIC_RWA_MARKET_ONBOARD_RETURN_URL: 'https://rwamarket.io' NEXT_PUBLIC_POOL_REGISTRY: '0xddf1c516cf87126c6c610b52fd8d609e67fb6033' NEXT_PUBLIC_POOLS_CONFIG: 'mainnetProduction' - NEXT_PUBLIC_POOLS_IPFS_HASH_OVERRIDE: 'QmfShrE7bvcjiyiBjyyzfJz6dFtZ8RLdoHHA9bG1GFZzby' + NEXT_PUBLIC_POOLS_IPFS_HASH_OVERRIDE: 'QmX5i85itxTPmTZDxvm4Rakhb23FawrLp4r4YrgjWjLJVj' NEXT_PUBLIC_PORTIS_KEY: 'bc9e2922-2ebd-4e2b-86f6-7c7855bdf07f' NEXT_PUBLIC_REWARDS_TREE_URL: 'https://storage.googleapis.com/rad-rewards-trees-mainnet-production/latest.json' NEXT_PUBLIC_RPC_URL: 'https://mainnet.infura.io/v3/ed5e0e19bcbc427cbf8f661736d44516' diff --git a/.github/workflows/tinlake-ui-deploy-to-prod.yml b/.github/workflows/tinlake-ui-deploy-to-prod.yml index d13601a7..e43ee359 100644 --- a/.github/workflows/tinlake-ui-deploy-to-prod.yml +++ b/.github/workflows/tinlake-ui-deploy-to-prod.yml @@ -60,7 +60,7 @@ jobs: NEXT_PUBLIC_RWA_MARKET_ONBOARD_RETURN_URL: 'https://rwamarket.io' NEXT_PUBLIC_POOL_REGISTRY: '0xddf1c516cf87126c6c610b52fd8d609e67fb6033' NEXT_PUBLIC_POOLS_CONFIG: 'mainnetProduction' - NEXT_PUBLIC_POOLS_IPFS_HASH_OVERRIDE: 'QmfShrE7bvcjiyiBjyyzfJz6dFtZ8RLdoHHA9bG1GFZzby' + NEXT_PUBLIC_POOLS_IPFS_HASH_OVERRIDE: 'QmX5i85itxTPmTZDxvm4Rakhb23FawrLp4r4YrgjWjLJVj' NEXT_PUBLIC_PORTIS_KEY: 'bc9e2922-2ebd-4e2b-86f6-7c7855bdf07f' NEXT_PUBLIC_REWARDS_TREE_URL: 'https://storage.googleapis.com/rad-rewards-trees-mainnet-production/latest.json' NEXT_PUBLIC_RPC_URL: 'https://mainnet.infura.io/v3/ed5e0e19bcbc427cbf8f661736d44516' diff --git a/.github/workflows/tinlake-ui-deploy-to-staging.yml b/.github/workflows/tinlake-ui-deploy-to-staging.yml index 095389d0..53524100 100644 --- a/.github/workflows/tinlake-ui-deploy-to-staging.yml +++ b/.github/workflows/tinlake-ui-deploy-to-staging.yml @@ -136,7 +136,7 @@ jobs: NEXT_PUBLIC_RWA_MARKET_ONBOARD_RETURN_URL: 'https://rwamarket.io' NEXT_PUBLIC_POOL_REGISTRY: '0xddf1c516cf87126c6c610b52fd8d609e67fb6033' NEXT_PUBLIC_POOLS_CONFIG: 'mainnetProduction' - NEXT_PUBLIC_POOLS_IPFS_HASH_OVERRIDE: 'QmfShrE7bvcjiyiBjyyzfJz6dFtZ8RLdoHHA9bG1GFZzby' + NEXT_PUBLIC_POOLS_IPFS_HASH_OVERRIDE: 'QmX5i85itxTPmTZDxvm4Rakhb23FawrLp4r4YrgjWjLJVj' NEXT_PUBLIC_PORTIS_KEY: 'bc9e2922-2ebd-4e2b-86f6-7c7855bdf07f' NEXT_PUBLIC_REWARDS_TREE_URL: 'https://storage.googleapis.com/rad-rewards-trees-mainnet-production/latest.json' NEXT_PUBLIC_RPC_URL: 'https://mainnet.infura.io/v3/ed5e0e19bcbc427cbf8f661736d44516' diff --git a/.github/workflows/tinlake-ui-pull-request.yml b/.github/workflows/tinlake-ui-pull-request.yml index f4a46435..74cc5677 100644 --- a/.github/workflows/tinlake-ui-pull-request.yml +++ b/.github/workflows/tinlake-ui-pull-request.yml @@ -138,7 +138,7 @@ jobs: NEXT_PUBLIC_RWA_MARKET_ONBOARD_RETURN_URL: 'https://rwamarket.io' NEXT_PUBLIC_POOL_REGISTRY: '0xddf1c516cf87126c6c610b52fd8d609e67fb6033' NEXT_PUBLIC_POOLS_CONFIG: 'mainnetProduction' - NEXT_PUBLIC_POOLS_IPFS_HASH_OVERRIDE: 'QmfShrE7bvcjiyiBjyyzfJz6dFtZ8RLdoHHA9bG1GFZzby' + NEXT_PUBLIC_POOLS_IPFS_HASH_OVERRIDE: 'QmX5i85itxTPmTZDxvm4Rakhb23FawrLp4r4YrgjWjLJVj' NEXT_PUBLIC_PORTIS_KEY: 'bc9e2922-2ebd-4e2b-86f6-7c7855bdf07f' NEXT_PUBLIC_REWARDS_TREE_URL: 'https://storage.googleapis.com/rad-rewards-trees-mainnet-production/latest.json' NEXT_PUBLIC_RPC_URL: 'https://mainnet.infura.io/v3/ed5e0e19bcbc427cbf8f661736d44516' diff --git a/tinlake.js/src/abi/index.ts b/tinlake.js/src/abi/index.ts index c3f13b1a..c8144851 100644 --- a/tinlake.js/src/abi/index.ts +++ b/tinlake.js/src/abi/index.ts @@ -61,4 +61,6 @@ export default { BORROWER_PROXY: contractAbiBorrowerProxy, ASSET_NFT: contractAbiNFTRegistry, MINTER: contractAbiNFTMinter, + LEGACY_ACTIONS: contractAbiActions, + LEGACY_PROXY_REGISTRY: contractAbiProxyRegistry, } as ContractAbis diff --git a/tinlake.js/src/actions/proxy.ts b/tinlake.js/src/actions/proxy.ts index b82196d4..821f218f 100644 --- a/tinlake.js/src/actions/proxy.ts +++ b/tinlake.js/src/actions/proxy.ts @@ -179,9 +179,7 @@ export function ProxyActions>(Bas amount, ]) - const owner = this.contract('TITLE').ownerOf(loanId).toString() - - if (this.contractAddresses['BORROWER_PROXY'] && owner === this.contractAddresses['BORROWER_PROXY']) { + if (this.contractAddresses['BORROWER_PROXY'] && proxyAddress === this.contractAddresses['BORROWER_PROXY']) { return this.pending( this.contract('BORROWER_PROXY').userExecute(this.contract('ACTIONS').address, encoded, { ...this.overrides, @@ -190,7 +188,7 @@ export function ProxyActions>(Bas ) } - if (this.contractAddresses['BORROWER_PROXY'] && owner !== this.contractAddresses['BORROWER_PROXY']) { + if (this.contractAddresses['BORROWER_PROXY'] && proxyAddress !== this.contractAddresses['BORROWER_PROXY']) { return this.pending( this.contract('PROXY', proxyAddress).execute(this.contract('LEGACY_ACTIONS').address, encoded, { ...this.overrides, @@ -213,9 +211,7 @@ export function ProxyActions>(Bas loanId, ]) - const owner = this.contract('TITLE').ownerOf(loanId).toString() - - if (this.contractAddresses['BORROWER_PROXY'] && owner === this.contractAddresses['BORROWER_PROXY']) { + if (this.contractAddresses['BORROWER_PROXY'] && proxyAddress === this.contractAddresses['BORROWER_PROXY']) { return this.pending( this.contract('BORROWER_PROXY').userExecute(this.contract('ACTIONS').address, encoded, { ...this.overrides, @@ -224,7 +220,7 @@ export function ProxyActions>(Bas ) } - if (this.contractAddresses['BORROWER_PROXY'] && owner !== this.contractAddresses['BORROWER_PROXY']) { + if (this.contractAddresses['BORROWER_PROXY'] && proxyAddress !== this.contractAddresses['BORROWER_PROXY']) { return this.pending( this.contract('PROXY', proxyAddress).execute(this.contract('LEGACY_ACTIONS').address, encoded, { ...this.overrides, @@ -251,9 +247,7 @@ export function ProxyActions>(Bas loanId, ]) - const owner = this.contract('TITLE').ownerOf(loanId).toString() - - if (this.contractAddresses['BORROWER_PROXY'] && owner === this.contractAddresses['BORROWER_PROXY']) { + if (this.contractAddresses['BORROWER_PROXY'] && proxyAddress === this.contractAddresses['BORROWER_PROXY']) { return this.pending( this.contract('BORROWER_PROXY').userExecute(this.contract('ACTIONS').address, encoded, { ...this.overrides, @@ -262,7 +256,7 @@ export function ProxyActions>(Bas ) } - if (this.contractAddresses['BORROWER_PROXY'] && owner !== this.contractAddresses['BORROWER_PROXY']) { + if (this.contractAddresses['BORROWER_PROXY'] && proxyAddress !== this.contractAddresses['BORROWER_PROXY']) { return this.pending( this.contract('PROXY', proxyAddress).execute(this.contract('LEGACY_ACTIONS').address, encoded, { ...this.overrides,